commit 3b69904421286e59a24c8985958e8421078f0f6b
author Sunny Goyal <sunnygoyal@google.com> Tue May 12 21:50:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 12 21:50:38 2015 +0000
tree b08b98bffe0ec6fae7aacb96ffad03c09db624e0
parent 95139bfa6c8a64a568a5700d6d254db6294b35d6
parent 19e4d9db28ee6487428879aacd053c319771b51c

am 19e4d9db: Merge "Preventing NullPointerException when cancelling a shortcut addition" into ub-launcher3-burnaby

* commit '19e4d9db28ee6487428879aacd053c319771b51c':
  Preventing NullPointerException when cancelling a shortcut addition

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a289fce..8603a35 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1377,7 +1377,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;