Merge "Fix crash caused by accessing finishing task" into tm-qpr-dev

2022-07-22 04:05:15 +00:00
parent a1be3b43bb eccd6e40a2
commit 2e0ed6a63b
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/RecentsAnimation.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimation.java
@@ -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());
    }
 }