summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-06-29 14:41:20 -0700
committerRomain Guy <romainguy@android.com>2009-06-29 14:41:20 -0700
commit08f97496b72aaff822aba89271e9bd458aafae2d (patch)
tree1ec29e199b0c85227a138e4cb65f7d66aa6d159c
parent806b0f3fbf02171c691b1f9d48e51a47760565b3 (diff)
downloadLauncher-08f97496b72aaff822aba89271e9bd458aafae2d.tar.gz
Fixes #1949637. Home was setting waitingForResult=true whenever an app was launched.
Home was incorrectly treating apps launches as subactivties launched to obtain results. This resulted in a protective flag being set when it should not have been.
-rw-r--r--src/com/android/launcher/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 918ffaa..0e5be6d 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -1096,7 +1096,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
@Override
public void startActivityForResult(Intent intent, int requestCode) {
- mWaitingForResult = true;
+ if (requestCode >= 0) mWaitingForResult = true;
super.startActivityForResult(intent, requestCode);
}