Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18ff9175 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I96d8955b0e141867d6cf54761c2d3935d50a2def
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00cb7e70 2e0ed6a6

services/core/java/com/android/server/wm/RecentsAnimation.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

}