commit 1d222f9ea6eccfffaf49119f61cb351d42226f03
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 04 23:55:39 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 04 23:55:39 2019 +0000
tree 98d32926c72c045a3655d15672e027f6ad08beb8
parent 137f5b62accb622bc3ff50bf7ed84c35dc35197f
parent c3c5292a2456f18d83cd1c2709d90f46e273ce43

Merge "fix the issue now playing shortcut cannot be dragged" into ub-launcher3-master

quickstep/src/com/android/launcher3/model/WellbeingModel.java

diff --git a/quickstep/src/com/android/launcher3/model/WellbeingModel.java b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
index 852a08e..5aa4388 100644
--- a/quickstep/src/com/android/launcher3/model/WellbeingModel.java
+++ b/quickstep/src/com/android/launcher3/model/WellbeingModel.java
@@ -335,8 +335,8 @@
      * Shortcut factory for generating wellbeing action
      */
     public static final SystemShortcut.Factory SHORTCUT_FACTORY = (activity, info) ->
-            WellbeingModel.get(activity).getShortcutForApp(
-                    info.getTargetComponent().getPackageName(),
-                    info.user.getIdentifier(),
-                    activity, info);
+            (info.getTargetComponent() == null) ? null : WellbeingModel.get(activity)
+                    .getShortcutForApp(
+                            info.getTargetComponent().getPackageName(), info.user.getIdentifier(),
+                            activity, info);
 }