Preventing NullPointerException when cancelling a shortcut addition

Bug: 21024018 Change-Id: Iac09d9e4f1411aa9fe1ec89fbfe749b009c7d457 (cherry picked from commit f044bb1edd)
2015-05-12 13:30:07 -07:00
parent 3af56b6052
commit a6095969bb
1 changed files with 3 additions and 1 deletions
@@ -1319,7 +1319,9 @@ public class Launcher extends Activity
            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;