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

* commit '91834235e86f04e0d5d45cdf19e5239c90962a59': Fix NPE when widget configuration activity is rotated (issue 6556784)
2012-05-29 17:56:12 -07:00
parent 725c873c03 91834235e8
commit 40828eab73
1 changed files with 1 additions and 0 deletions
@@ -817,6 +817,7 @@ public final class Launcher extends Activity
            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;
        }