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

Merge "Finishing root activity if having other running activities" into sc-v2-dev

Browse Source
This commit is contained in:
Louis Chang
2021-07-23 06:52:09 +00:00
committed by Android (Google) Code Review
parent c7efed22c4 01dbaea047
commit f1a38d121f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1183,7 +1183,7 @@ class ActivityClientController extends IActivityClientController.Stub {
try { try {
final Intent baseActivityIntent; final Intent baseActivityIntent;
final boolean launchedFromHome; final boolean launchedFromHome;
final boolean isLastRunningActivity;
synchronized (mGlobalLock) { synchronized (mGlobalLock) {
final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token); final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);
if (r == null) return; if (r == null) return;
@@ -1195,7 +1195,9 @@ class ActivityClientController extends IActivityClientController.Stub {
return; return;
} }
final Intent baseIntent = r.getTask().getBaseIntent(); final Task task = r.getTask();
isLastRunningActivity = task.topRunningActivity() == r;
final Intent baseIntent = task.getBaseIntent();
final boolean activityIsBaseActivity = baseIntent != null final boolean activityIsBaseActivity = baseIntent != null
&& r.mActivityComponent.equals(baseIntent.getComponent()); && r.mActivityComponent.equals(baseIntent.getComponent());
baseActivityIntent = activityIsBaseActivity ? r.intent : null; baseActivityIntent = activityIsBaseActivity ? r.intent : null;
@@ -1205,12 +1207,13 @@ class ActivityClientController extends IActivityClientController.Stub {
// If the activity is one of the main entry points for the application, then we should // If the activity is one of the main entry points for the application, then we should
// refrain from finishing the activity and instead move it to the back to keep it in // refrain from finishing the activity and instead move it to the back to keep it in
// memory. The requirements for this are: // memory. The requirements for this are:
// 1. The current activity is the base activity for the task. // 1. The activity is the last running activity in the task.
// 2. a. If the activity was launched by the home process, we trust that its intent // 2. The current activity is the base activity for the task.
// 3. a. If the activity was launched by the home process, we trust that its intent
// was resolved, so we check if the it is a main intent for the application. // was resolved, so we check if the it is a main intent for the application.
// b. Otherwise, we query Package Manager to verify whether the activity is a // b. Otherwise, we query Package Manager to verify whether the activity is a
// launcher activity for the application. // launcher activity for the application.
if (baseActivityIntent != null if (baseActivityIntent != null && isLastRunningActivity
&& ((launchedFromHome && ActivityRecord.isMainIntent(baseActivityIntent)) && ((launchedFromHome && ActivityRecord.isMainIntent(baseActivityIntent))
|| isLauncherActivity(baseActivityIntent.getComponent()))) { || isLauncherActivity(baseActivityIntent.getComponent()))) {
moveActivityTaskToBack(token, false /* nonRoot */); moveActivityTaskToBack(token, false /* nonRoot */);