commit c50fe371b16e903eefa33196703b710042b107e2
author Jonathan Miranda <jonmiranda@google.com> Wed Sep 25 15:26:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 25 15:26:07 2019 -0700
tree be7e10155548d1baf930558ed5c72e01e1046e89
parent 7ab1d09f844e64db8a9ae365d1e310a37d9dfead
parent 0e752faff408179c2f51187859050417cdb15df7

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

Change-Id: I11fc10b79d83971d7eeb466a619f50fc3fd5a637

src/com/android/launcher3/InstallShortcutReceiver.java

diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index fb80537..17fbb79 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -619,6 +619,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);