OSDN Git Service

ComponentName null check MUST proceed before creating ComponentKey.
authorHyunyoung Song <hyunyoungs@google.com>
Mon, 29 Aug 2016 21:43:53 +0000 (14:43 -0700)
committerHyunyoung Song <hyunyoungs@google.com>
Mon, 29 Aug 2016 21:43:53 +0000 (14:43 -0700)
Change-Id: I2460561b62d77d3f2f17dc2a7db765785b46a8c6

src/com/android/launcher3/Launcher.java

index f125287..340c670 100644 (file)
@@ -4170,6 +4170,10 @@ public class Launcher extends Activity
             return Collections.EMPTY_LIST;
         }
         ComponentName component = info.getTargetComponent();
+        if (component == null) {
+            return Collections.EMPTY_LIST;
+        }
+
         List<String> ids = mDeepShortcutMap.get(new ComponentKey(component, info.user));
         return ids == null ? Collections.EMPTY_LIST : ids;
     }