diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-08-31 18:30:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-31 18:30:00 +0000 |
| commit | c8b997a21ca1fb7c951cfb1cbb22477f874b6f03 (patch) | |
| tree | eebbbcd1431dd4b59ad5c1b4ad5bf7bebc0f6781 /src/com/android | |
| parent | dfc8b6685bf330b203cb16b67c39bed936030306 (diff) | |
| parent | d3bf9803f51efa88d966f60b890a5f8193c75d43 (diff) | |
| download | android_packages_apps_Trebuchet-c8b997a21ca1fb7c951cfb1cbb22477f874b6f03.tar.gz android_packages_apps_Trebuchet-c8b997a21ca1fb7c951cfb1cbb22477f874b6f03.tar.bz2 android_packages_apps_Trebuchet-c8b997a21ca1fb7c951cfb1cbb22477f874b6f03.zip | |
Merge "ComponentName null check MUST proceed before creating ComponentKey." into ub-launcher3-calgary-polish
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index e1c64a72d..c919db8b7 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4171,6 +4171,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; } |