From f3ccee3827cccb8bc38e03e6001efb6eb214d05b Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Wed, 13 Jul 2022 05:50:44 +0000 Subject: Revert "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments" This reverts commit 762850ba32283c1ddba91e29774b61cca007ae49. Reason for revert: b/238714871 Change-Id: I5f23a725940f0291ba5cfab1aa6e361c0e6c6ac5 --- .../core/java/com/android/server/wm/ActivityStarter.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 960b1bcd5c42..fc412cbdad72 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 @@ class ActivityStarter { 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 @@ class ActivityStarter { } } - 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. -- cgit v1.2.3-59-g8ed1b