Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments"" into tm-qpr-dev am: 6446b23045

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272610

Change-Id: I13b1ef9d5dd48ed589239d69a2d5839e81e55736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-07-14 02:15:20 +00:00
committed by Automerger Merge Worker
parent 42df6531c6 6446b23045
commit 355877448e
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2565,7 +2565,6 @@ class ActivityStarter {
mInTask = null; mInTask = null;
} }
mInTaskFragment = inTaskFragment; mInTaskFragment = inTaskFragment;
sendNewTaskFragmentResultRequestIfNeeded();
mStartFlags = startFlags; mStartFlags = startFlags;
// If the onlyIfNeeded flag is set, then we can do this if the activity being launched // If the onlyIfNeeded flag is set, then we can do this if the activity being launched
@@ -2608,18 +2607,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() { private void computeLaunchingTaskFlags() {
// If the caller is not coming from another activity, but has given us an explicit task into // 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. // which they would like us to launch the new activity, then let's see about doing that.