commit 87a9f5bf6a62a2b877bd2285f91e0300b288e02a
author Adam Cohen <adamcohen@google.com> Tue May 29 16:16:51 2012 -0700
committer Adam Cohen <adamcohen@google.com> Tue May 29 16:18:15 2012 -0700
tree 66cdfb6d615fce77876e415943e05ff1136ec034
parent 4c69ebb10833b1f84d80e1ba83f3ffa7fdc4e7ab

Fix NPE when widget configuration activity is rotated (issue 6556784)

Change-Id: I0f8949d348c11b173ba3e7c9cd6b7117c02e0c70

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index d01de9c..9dc1fe4 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -817,6 +817,7 @@
             mPendingAddInfo.spanX = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_X);
             mPendingAddInfo.spanY = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_Y);
             mPendingAddWidgetInfo = savedState.getParcelable(RUNTIME_STATE_PENDING_ADD_WIDGET_INFO);
+            mWaitingForResult = true;
             mRestoring = true;
         }