commit 0bf7cdc84ee3cff750fb4d2f4644c28018fee4a8
author Jon Miranda <jonmiranda@google.com> Thu Sep 26 13:27:59 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 26 13:27:59 2019 -0700
tree 9dccc7cf29947ecc8e5335a04a74f6295c49374e
parent a2da38380cf2e1ee01d0f7590cab647e75308250
parent 45bf3818361f174418fb242cf44086eebf6d42b4

Fix NPE when trying to construct WorkspaceItemInfo with null intent data. am: 79d6b30dce
am: 45bf381836

Change-Id: Ie0b92c45528f3b8bc961254a6fedaf91ce5aea65

src/com/android/launcher3/InstallShortcutReceiver.java

diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index c9e7d91..aa975bd 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -620,6 +620,11 @@
     }
 
     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);