Merge "Check task switch by comparing leaf task." into tm-dev am: f55e364598 am: d92bc73bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425963 Change-Id: I9ce13e2916775015295e904cfdfad1d8279dc016 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1797,7 +1797,8 @@ class ActivityStarter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get top task at beginning because the order may be changed when reusing existing task.
|
// 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();
|
final Task reusedTask = getReusableTask();
|
||||||
|
|
||||||
// If requested, freeze the task list
|
// If requested, freeze the task list
|
||||||
|
|||||||
Reference in New Issue
Block a user