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

Merge "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments" into tm-qpr-dev

Browse Source
This commit is contained in:
Louis Chang
2022-06-28 01:34:19 +00:00
committed by Android (Google) Code Review
parent 3f6d25b5df 762850ba32
commit e2bf40bc0c
1 changed files with 13 additions and 0 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

@@ -2576,6 +2576,7 @@ 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
@@ -2618,6 +2619,18 @@ 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.