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 am: f1a38d121f

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

Change-Id: I1010babaf075eeb4f059e9a788ad9e74c18e32a1
This commit is contained in:
Louis Chang
2021-07-23 07:06:11 +00:00
committed by Automerger Merge Worker
parent 77d8f94df8 f1a38d121f
commit c094430565
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 {
final Intent baseActivityIntent;
final boolean launchedFromHome;
final boolean isLastRunningActivity;
synchronized (mGlobalLock) {
final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);
if (r == null) return;
@@ -1195,7 +1195,9 @@ class ActivityClientController extends IActivityClientController.Stub {
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
&& r.mActivityComponent.equals(baseIntent.getComponent());
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
// refrain from finishing the activity and instead move it to the back to keep it in
// memory. The requirements for this are:
// 1. The current activity is the base activity for the task.
// 2. a. If the activity was launched by the home process, we trust that its intent
// 1. The activity is the last running activity in the task.
// 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.
// b. Otherwise, we query Package Manager to verify whether the activity is a
// launcher activity for the application.
if (baseActivityIntent != null
if (baseActivityIntent != null && isLastRunningActivity
&& ((launchedFromHome && ActivityRecord.isMainIntent(baseActivityIntent))
|| isLauncherActivity(baseActivityIntent.getComponent()))) {
moveActivityTaskToBack(token, false /* nonRoot */);