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

Merge "Fix crash caused by accessing finishing task" into tm-qpr-dev am: 2e0ed6a63b

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

Change-Id: I96d8955b0e141867d6cf54761c2d3935d50a2def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2022-07-22 04:20:06 +00:00
committed by Automerger Merge Worker
parent 00cb7e70d7 2e0ed6a63b
commit 18ff9175da
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -520,7 +520,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
} }
private boolean matchesTarget(Task task) { private boolean matchesTarget(Task task) {
return task.mUserId == mUserId return task.getNonFinishingActivityCount() > 0 && task.mUserId == mUserId
&& task.getBaseIntent().getComponent().equals(mTargetIntent.getComponent()); && task.getBaseIntent().getComponent().equals(mTargetIntent.getComponent());
} }
} }