commit 2a23c2e341e5211626b0b28c4cccfb3d10fddbc9
author Riddle Hsu <riddlehsu@google.com> Thu Dec 01 07:13:44 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 01 07:13:44 2022 +0000
tree 0d9d31577944145ef2b9b3cb1cb773c6f1e26591
parent daa91b75820b4265ccfe0f4924ab7eb890867112
parent 4733e7031a82d65e0286c76be518a58d1551d97c

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

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

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 9d518df..ec3962c 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -228,7 +228,8 @@
     }
 
     @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) {