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

Removes the redundant instance for singleInstance

Browse Source 
The activity with launchMode "singleInstance" was able to be created
in multiple instances. It contradicts with developers' documentation.
The conditions for searching the reusable tasks always ignore the
start-for-result results in singleInstance instances being created.

The CL finishes existing instance when a new instance of
singleInstance activity launches, in order to keep only one instance
in the system. Some compatibility issues might be introduced if app
incorrectly depend on singleInstance activities to be multiple
instances.

Bug: 122967919
Test: atest IntentTests
Change-Id: I6345985a0ee5bd47d100d529bc3b50e8ae4d2bab
This commit is contained in:
Jeff Chang
2022-08-11 18:44:12 +08:00
parent a8ecc8e041
commit 9a0b544d93
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1866,6 +1866,16 @@ class ActivityStarter {
final ActivityRecord targetTaskTop = newTask
? null : targetTask.getTopNonFinishingActivity();
if (targetTaskTop != null) {
// Removes the existing singleInstance activity in another task (if any) while
// launching a singleInstance activity on sourceRecord's task.
if (LAUNCH_SINGLE_INSTANCE == mLaunchMode && mSourceRecord != null
&& targetTask == mSourceRecord.getTask()) {
final ActivityRecord activity = mRootWindowContainer.findActivity(mIntent,
mStartActivity.info, false);
if (activity != null && activity.getTask() != targetTask) {
activity.destroyIfPossible("Removes redundant singleInstance");
}
}
// Recycle the target task for this launch.
startResult = recycleTask(targetTask, targetTaskTop, reusedTask, intentGrants);
if (startResult != START_SUCCESS) {