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

Commit e467fe5b authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE from startNewTransition" into tm-qpr-dev am: 2a23c2e3 

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



Change-Id: I905bbb7aece1c3259d2df32ba395de1125aad8aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9cdabf1f 2a23c2e3

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -228,7 +228,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
    }

    }





    @Nullable

    @Nullable

    static Transition fromBinder(@NonNull IBinder token) {

    static Transition fromBinder(@Nullable IBinder token) {

        if (token == null) return null;

        try {

        try {

            return ((Token) token).mTransition.get();

            return ((Token) token).mTransition.get();

        } catch (ClassCastException e) {

        } catch (ClassCastException e) {