diff options
| author | Pinyao Ting <pinyaoting@google.com> | 2019-08-16 13:28:24 -0700 |
|---|---|---|
| committer | Pinyao Ting <pinyaoting@google.com> | 2019-08-16 21:50:21 +0000 |
| commit | d88f63bbed4c4c1e7eace9ab8c25e89ad6c662c9 (patch) | |
| tree | 664e606ca2c0ecb1fac192295aecc48806c3a7ed /src_shortcuts_overrides | |
| parent | 74aff3b2067794650b8a6613894e3f6b8dd908c7 (diff) | |
| download | android_packages_apps_Trebuchet-d88f63bbed4c4c1e7eace9ab8c25e89ad6c662c9.tar.gz android_packages_apps_Trebuchet-d88f63bbed4c4c1e7eace9ab8c25e89ad6c662c9.tar.bz2 android_packages_apps_Trebuchet-d88f63bbed4c4c1e7eace9ab8c25e89ad6c662c9.zip | |
add null check when accessing target component from iteminfo
Bug: 139540363
Change-Id: I25d0100077de67b085c27b5ef91e22c6ac1ad959
Merged-In: I25d0100077de67b085c27b5ef91e22c6ac1ad959
Diffstat (limited to 'src_shortcuts_overrides')
| -rw-r--r-- | src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java index 7119aeadf..09b189049 100644 --- a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java +++ b/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java @@ -27,6 +27,8 @@ import android.os.Bundle; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.Nullable; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -78,8 +80,9 @@ public class DeepShortcutManager { * Gets all the manifest and dynamic shortcuts associated with the given package and user, * to be displayed in the shortcuts container on long press. */ - public List<ShortcutInfo> queryForShortcutsContainer(ComponentName activity, + public List<ShortcutInfo> queryForShortcutsContainer(@Nullable ComponentName activity, UserHandle user) { + if (activity == null) return Collections.EMPTY_LIST; return query(ShortcutQuery.FLAG_MATCH_MANIFEST | ShortcutQuery.FLAG_MATCH_DYNAMIC, activity.getPackageName(), activity, null, user); } |