diff options
| author | Jonathan Miranda <jonmiranda@google.com> | 2019-09-25 22:07:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-25 22:07:31 +0000 |
| commit | 0e752faff408179c2f51187859050417cdb15df7 (patch) | |
| tree | 86f615b8475baff3a971b398011edbe360ab4cba /src/com | |
| parent | 7ad1026cad1029ca12e95f51f8b7322617f46806 (diff) | |
| parent | 10b898eee6fef17206c2007ec64f99929e22efac (diff) | |
| download | android_packages_apps_Trebuchet-0e752faff408179c2f51187859050417cdb15df7.tar.gz android_packages_apps_Trebuchet-0e752faff408179c2f51187859050417cdb15df7.tar.bz2 android_packages_apps_Trebuchet-0e752faff408179c2f51187859050417cdb15df7.zip | |
Merge "Fix NPE when trying to construct WorkspaceItemInfo with null intent data." into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/InstallShortcutReceiver.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index 670cd2877..f19c60268 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -631,6 +631,11 @@ public class InstallShortcutReceiver extends BroadcastReceiver { } private static WorkspaceItemInfo createWorkspaceItemInfo(Intent data, LauncherAppState app) { + if (data == null) { + Log.e(TAG, "Can't construct WorkspaceItemInfo with null data"); + return null; + } + Intent intent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT); String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME); Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON); |