commit ebbc33f452b6a1c69eddb9953991b00b7d9a7682
author Jonathan Miranda <jonmiranda@google.com> Wed Sep 25 15:32:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 25 15:32:07 2019 -0700
tree 3c9070067ca252ec4a09c06fb7998a45c94d98a1
parent 48a45bf148bb539d387198275636d7bad043a8aa
parent c50fe371b16e903eefa33196703b710042b107e2

Merge "Fix NPE when trying to construct WorkspaceItemInfo with null intent data." into ub-launcher3-qt-qpr1-dev am: 0e752faff4
am: c50fe371b1

Change-Id: I2c7746f96f68fe1f0d117196c1fe3fc07a3e8825

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);