am 742966ba: Launcher2 - Fix 2171232 Homescreen stopped responding after pressing home in wallpaper selector.
Merge commit '742966ba0eb3106202b57709f3cc9c2ecfb2a41d'
* commit '742966ba0eb3106202b57709f3cc9c2ecfb2a41d':
Launcher2 - Fix 2171232 Homescreen stopped responding after pressing home in wallpaper selector.
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b8ad189..4fe655e 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -774,6 +774,9 @@
if (Intent.ACTION_MAIN.equals(intent.getAction())) {
getWindow().closeAllPanels();
+ // Whatever we were doing is hereby canceled.
+ mWaitingForResult = false;
+
// Set this flag so that onResume knows to close the search dialog if it's open,
// because this was a new intent (thus a press of 'home' or some such) rather than
// for example onResume being called when the user pressed the 'back' button.