From: Adam Cohen <adamcohen@google.com>
Date: Tue, 29 May 2012 23:16:51 +0000 (-0700)
Subject: Fix NPE when widget configuration activity is rotated (issue 6556784)
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87a9f5bf6a62a2b877bd2285f91e0300b288e02a;p=android-x86%2Fpackages-apps-Trebuchet.git

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

Change-Id: I0f8949d348c11b173ba3e7c9cd6b7117c02e0c70
---

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index d01de9c77..9dc1fe4be 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -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;
         }