Merge "Preventing NullPointerException when cancelling a shortcut addition" into ub-launcher3-burnaby

2015-05-12 21:43:51 +00:00
parent 2517f88795 f044bb1edd
commit 19e4d9db28
1 changed files with 3 additions and 1 deletions
@@ -1377,7 +1377,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;