diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-05-29 17:56:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-29 17:56:12 -0700 |
| commit | 40828eab739af1ddc699d9c96e410ef1f107209d (patch) | |
| tree | 631adf301ff844b712f7f645fd6525a67ee316b0 | |
| parent | 725c873c0340bd92f805bc4a365214ff118b0bb0 (diff) | |
| parent | 91834235e86f04e0d5d45cdf19e5239c90962a59 (diff) | |
| download | android_packages_apps_Trebuchet-40828eab739af1ddc699d9c96e410ef1f107209d.tar.gz android_packages_apps_Trebuchet-40828eab739af1ddc699d9c96e410ef1f107209d.tar.bz2 android_packages_apps_Trebuchet-40828eab739af1ddc699d9c96e410ef1f107209d.zip | |
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.java | 1 |
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; } |