commit df4ce4d6c14cc0bfd26f20571e743fd2b1d6a363
author android-build-team Robot <android-build-team-robot@google.com> Sat Sep 28 23:21:09 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Sep 28 23:21:09 2019 +0000
tree beaf800d3b60622a2bb9d35ee542cf3e0e3ce11a
parent 8ddc17f325c54598473a3f0cf726358a1a8619c7
parent 79d6b30dce0eddcdecad4646018284a4db09829b

Snap for 5907400 from 79d6b30dce0eddcdecad4646018284a4db09829b to qt-qpr1-release

Change-Id: I31f36b0866a15da09a999ea9a2dbf7e07e32fb6f

src/com/android/launcher3/InstallShortcutReceiver.java

diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index 670cd28..f19c602 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -631,6 +631,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);