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

Commit db4b07ad authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: 46cecd43

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



Change-Id: I39ba4838a5114b1da31095c7d4111fb18967d68a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7af288c1 46cecd43

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

+2 −1
Original line number Diff line number Diff line
@@ -1797,7 +1797,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