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

Commit 16f304c9 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6661beb911a74b34fba3d9a9d96e1a50ba1b3744
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd06c94d f55e3645

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