am e05f457b: am a5c32d6e: Fix bugs 226264 and 2265943 - Home stopped responding to touch, but all-apps & notification panel still work

Merge commit 'e05f457b74a1b69133d9df81fb27d376fb625122' into eclair-mr2-plus-aosp

* commit 'e05f457b74a1b69133d9df81fb27d376fb625122':
  Fix bugs 226264 and 2265943 - Home stopped responding to touch, but all-apps & notification panel

src/com/android/launcher2/Launcher.java

@@ -831,6 +831,9 @@ public final class Launcher extends Activity
         } catch (Exception e) {
             // An exception is thrown if the dialog is not visible, which is fine
         }
+
+        // Whatever we were doing is hereby canceled.
+        mWaitingForResult = false;
     }
 
     @Override
@@ -839,11 +842,9 @@ public final class Launcher extends Activity
 
         // Close the menu
         if (Intent.ACTION_MAIN.equals(intent.getAction())) {
+            // also will cancel mWaitingForResult.
             closeSystemDialogs();
 
-            // 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.