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

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

Change-Id: Ib3a6eef7c7e42f6d88b484ceba1d513e5594c828
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:39:27 +00:00
committed by Automerger Merge Worker

View File

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