summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-05-29 17:56:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-29 17:56:12 -0700
commit40828eab739af1ddc699d9c96e410ef1f107209d (patch)
tree631adf301ff844b712f7f645fd6525a67ee316b0
parent725c873c0340bd92f805bc4a365214ff118b0bb0 (diff)
parent91834235e86f04e0d5d45cdf19e5239c90962a59 (diff)
downloadandroid_packages_apps_Trebuchet-40828eab739af1ddc699d9c96e410ef1f107209d.zip
android_packages_apps_Trebuchet-40828eab739af1ddc699d9c96e410ef1f107209d.tar.gz
android_packages_apps_Trebuchet-40828eab739af1ddc699d9c96e410ef1f107209d.tar.bz2
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)
-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 d01de9c..9dc1fe4 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;
}