Revert "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments"
This reverts commit 762850ba32283c1ddba91e29774b61cca007ae49.
Reason for revert: b/238714871
Change-Id: I5f23a725940f0291ba5cfab1aa6e361c0e6c6ac5
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index 960b1bc..fc412cbd 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2576,7 +2576,6 @@
mInTask = null;
}
mInTaskFragment = inTaskFragment;
- sendNewTaskFragmentResultRequestIfNeeded();
mStartFlags = startFlags;
// If the onlyIfNeeded flag is set, then we can do this if the activity being launched
@@ -2619,18 +2618,6 @@
}
}
- private void sendNewTaskFragmentResultRequestIfNeeded() {
- if (mStartActivity.resultTo != null && mInTaskFragment != null
- && mInTaskFragment != mStartActivity.resultTo.getTaskFragment()) {
- Slog.w(TAG,
- "Activity is launching as a new TaskFragment, so cancelling activity result.");
- mStartActivity.resultTo.sendResult(INVALID_UID, mStartActivity.resultWho,
- mStartActivity.requestCode, RESULT_CANCELED,
- null /* data */, null /* dataGrants */);
- mStartActivity.resultTo = null;
- }
- }
-
private void computeLaunchingTaskFlags() {
// If the caller is not coming from another activity, but has given us an explicit task into
// which they would like us to launch the new activity, then let's see about doing that.
