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

Commit b5250284 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

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

parents 8f50e091 68ac617a
Loading
Loading
Loading
Loading
+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);
            }