commit a6095969bb5938ad95ee9f858970d5eb54eb124d
author Sunny Goyal <sunnygoyal@google.com> Tue May 12 13:30:07 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed May 13 01:07:17 2015 +0000
tree 7fb066b70cadd5a11ac48ded9fc0df50001e7389
parent 3af56b605217e4ff1c6ed79a70fa49eacaf5b02f

Preventing NullPointerException when cancelling a shortcut addition

Bug: 21024018
Change-Id: Iac09d9e4f1411aa9fe1ec89fbfe749b009c7d457
(cherry picked from commit f044bb1edd8670fbc2cf9eeb1a51c31b91f0889c)

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5b8eaef..2fc3b75 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1319,7 +1319,9 @@
             mPendingAddInfo.spanY = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_Y);
             AppWidgetProviderInfo info = savedState.getParcelable(
                     RUNTIME_STATE_PENDING_ADD_WIDGET_INFO);
-            mPendingAddWidgetInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(this, info);
+            mPendingAddWidgetInfo = info == null ?
+                    null : LauncherAppWidgetProviderInfo.fromProviderInfo(this, info);
+
             mPendingAddWidgetId = savedState.getInt(RUNTIME_STATE_PENDING_ADD_WIDGET_ID);
             setWaitingForResult(true);
             mRestoring = true;