diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-06-14 17:50:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-14 17:50:10 +0000 |
| commit | b030e5162c1664614730ff04908adc3193ad1ec6 (patch) | |
| tree | b4c34c9826e8925b1268e58a06ef93333bcbf45d /src | |
| parent | dfbb964dcc44dec89f6c64801f60fdcb93c9e5de (diff) | |
| parent | b223cc857bd71a8543ffe07c28957fe3acf33334 (diff) | |
| download | android_packages_apps_Trebuchet-b030e5162c1664614730ff04908adc3193ad1ec6.tar.gz android_packages_apps_Trebuchet-b030e5162c1664614730ff04908adc3193ad1ec6.tar.bz2 android_packages_apps_Trebuchet-b030e5162c1664614730ff04908adc3193ad1ec6.zip | |
Merge "Adding null check before accessing shortcut extras" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/icons/LauncherIcons.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/icons/LauncherIcons.java b/src/com/android/launcher3/icons/LauncherIcons.java index 3b74307db..763240885 100644 --- a/src/com/android/launcher3/icons/LauncherIcons.java +++ b/src/com/android/launcher3/icons/LauncherIcons.java @@ -189,6 +189,7 @@ public class LauncherIcons extends BaseIconFactory implements AutoCloseable { private String getBadgePackage(ShortcutInfo si) { String whitelistedPkg = mContext.getString(R.string.shortcutinfo_badgepkg_whitelist); if (whitelistedPkg.equals(si.getPackage()) + && si.getExtras() != null && si.getExtras().containsKey(EXTRA_BADGEPKG)) { return si.getExtras().getString(EXTRA_BADGEPKG); } |