commit 91834235e86f04e0d5d45cdf19e5239c90962a59
author Adam Cohen <adamcohen@google.com> Tue May 29 17:53:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 29 17:53:05 2012 -0700
tree 631adf301ff844b712f7f645fd6525a67ee316b0
parent 7afa902b6cf1b63aa145ec95bc62757b4f680abd
parent 87a9f5bf6a62a2b877bd2285f91e0300b288e02a

Merge "Fix NPE when widget configuration activity is rotated (issue 6556784)" into jb-dev

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;
         }