Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f227ca10 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

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

Merge "Allow moveActivityTaskToBack on aliased activities" into sc-v2-dev am: b5250284 am: ee97f023

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

Change-Id: I90c9e827b873215478f495423cbabdca3289dda8
parents a05a1d3a ee97f023

services/core/java/com/android/server/wm/ActivityClientController.java

+4 −4
Original line number Diff line number Diff line
@@ -1197,10 +1197,10 @@ class ActivityClientController extends IActivityClientController.Stub { 


                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;



                final boolean isBaseActivity = r.mActivityComponent.equals(task.realActivity);

                baseActivityIntent = isBaseActivity ? r.intent : null;



                launchedFromHome = r.isLaunchSourceType(ActivityRecord.LAUNCH_SOURCE_TYPE_HOME);

            }