Merge "Fix NPE from startNewTransition" into tm-qpr-dev

2022-12-01 07:13:44 +00:00
parent daa91b7582 4733e7031a
commit 2a23c2e341
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -228,7 +228,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
    }

    @Nullable
-    static Transition fromBinder(@NonNull IBinder token) {
+    static Transition fromBinder(@Nullable IBinder token) {
+        if (token == null) return null;
        try {
            return ((Token) token).mTransition.get();
        } catch (ClassCastException e) {