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

Commit 46cecd43 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Check task switch by comparing leaf task." into tm-dev am:... 

Merge "Merge "Check task switch by comparing leaf task." into tm-dev am: f55e3645 am: 16f304c9" into tm-d1-dev-plus-aosp
parents 55c29cf3 64a379e7

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

+2 −1
Original line number Diff line number Diff line
@@ -1786,7 +1786,8 @@ class ActivityStarter { 
        }



        // Get top task at beginning because the order may be changed when reusing existing task.

        final Task prevTopTask = mPreferredTaskDisplayArea.getFocusedRootTask();

        final Task prevTopRootTask = mPreferredTaskDisplayArea.getFocusedRootTask();

        final Task prevTopTask = prevTopRootTask != null ? prevTopRootTask.getTopLeafTask() : null;

        final Task reusedTask = getReusableTask();



        // If requested, freeze the task list