Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes unable to start recents activity" into sc-dev

Browse Source
This commit is contained in:
Louis Chang
2021-04-06 13:15:33 +00:00
committed by Android (Google) Code Review
parent 9f72c9fdd1 5420d290ea
commit e4e799c79e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/RecentsAnimation.java
View File

@@ -171,7 +171,8 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
final boolean hasExistingActivity = targetActivity != null; final boolean hasExistingActivity = targetActivity != null;
if (hasExistingActivity) { if (hasExistingActivity) {
mRestoreTargetBehindRootTask = getRootTaskAbove(targetRootTask); mRestoreTargetBehindRootTask = getRootTaskAbove(targetRootTask);
if (mRestoreTargetBehindRootTask == null) { if (mRestoreTargetBehindRootTask == null
&& targetRootTask.getTopMostTask() == targetActivity.getTask()) {
notifyAnimationCancelBeforeStart(recentsAnimationRunner); notifyAnimationCancelBeforeStart(recentsAnimationRunner);
ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
"No root task above target root task=%s", targetRootTask); "No root task above target root task=%s", targetRootTask);