summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-05-29 16:16:51 -0700
committerAdam Cohen <adamcohen@google.com>2012-05-29 16:18:15 -0700
commit87a9f5bf6a62a2b877bd2285f91e0300b288e02a (patch)
tree66cdfb6d615fce77876e415943e05ff1136ec034 /src/com/android/launcher2
parent4c69ebb10833b1f84d80e1ba83f3ffa7fdc4e7ab (diff)
downloadandroid_packages_apps_Trebuchet-87a9f5bf6a62a2b877bd2285f91e0300b288e02a.tar.gz
android_packages_apps_Trebuchet-87a9f5bf6a62a2b877bd2285f91e0300b288e02a.tar.bz2
android_packages_apps_Trebuchet-87a9f5bf6a62a2b877bd2285f91e0300b288e02a.zip
Fix NPE when widget configuration activity is rotated (issue 6556784)
Change-Id: I0f8949d348c11b173ba3e7c9cd6b7117c02e0c70
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r--src/com/android/launcher2/Launcher.java1
1 files changed, 1 insertions, 0 deletions
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;
}