diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-08-29 14:43:53 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-08-29 14:43:53 -0700 |
| commit | d3bf9803f51efa88d966f60b890a5f8193c75d43 (patch) | |
| tree | 283d8dd85804c028a577633b227176917a6ca8b9 /src/com/android/launcher3/Launcher.java | |
| parent | 4a4b49ff3482cbe7f8192807cdc99437810fe518 (diff) | |
| download | android_packages_apps_Trebuchet-d3bf9803f51efa88d966f60b890a5f8193c75d43.tar.gz android_packages_apps_Trebuchet-d3bf9803f51efa88d966f60b890a5f8193c75d43.tar.bz2 android_packages_apps_Trebuchet-d3bf9803f51efa88d966f60b890a5f8193c75d43.zip | |
ComponentName null check MUST proceed before creating ComponentKey.
Change-Id: I2460561b62d77d3f2f17dc2a7db765785b46a8c6
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -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 f125287bb..340c670b1 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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; } |