commit c3c5292a2456f18d83cd1c2709d90f46e273ce43
author Pinyao Ting <pinyaoting@google.com> Mon Nov 04 14:57:43 2019 -0800
committer Pinyao Ting <pinyaoting@google.com> Mon Nov 04 14:57:43 2019 -0800
tree bbf970c2a5cc0c7ba097b1c48034df48da9d705c
parent 43968167d92804b3810718473178f74cc5e4fcef

fix the issue now playing shortcut cannot be dragged

Bug: 143904998
Test: put now playing shortcut in workspace, verify dragging it doesn't
cause a crash

Change-Id: Ic531b43d61d55ec14e9f420ff799a36b8d785e2a

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);
 }