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

Merge "Allow moveActivityTaskToBack on aliased activities" into sc-v2-dev

Browse Source
This commit is contained in:
Prabir Pradhan
2021-08-05 10:28:29 +00:00
committed by Android (Google) Code Review
parent 8f50e09163 68ac617a4b
commit b525028439
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1197,10 +1197,10 @@ class ActivityClientController extends IActivityClientController.Stub {
final Task task = r.getTask(); final Task task = r.getTask();
isLastRunningActivity = task.topRunningActivity() == r; isLastRunningActivity = task.topRunningActivity() == r;
final Intent baseIntent = task.getBaseIntent();
final boolean activityIsBaseActivity = baseIntent != null final boolean isBaseActivity = r.mActivityComponent.equals(task.realActivity);
&& r.mActivityComponent.equals(baseIntent.getComponent()); baseActivityIntent = isBaseActivity ? r.intent : null;
baseActivityIntent = activityIsBaseActivity ? r.intent : null;
launchedFromHome = r.isLaunchSourceType(ActivityRecord.LAUNCH_SOURCE_TYPE_HOME); launchedFromHome = r.isLaunchSourceType(ActivityRecord.LAUNCH_SOURCE_TYPE_HOME);
} }