From 4733e7031a82d65e0286c76be518a58d1551d97c Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Wed, 30 Nov 2022 18:15:24 +0800
Subject: [PATCH] Fix NPE from startNewTransition

With shell transition, the token can be null from
WindowOrganizerController#startNewTransition.
E.g. entering split screen.

Bug: 258913831
Test: atest TransitionTests
Change-Id: I77e85c4a340a88056c8188f5da99cf57bf52197e
---
 services/core/java/com/android/server/wm/Transition.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 7ce17d422386e..c1f0a5fb708f7 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 @@ 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) {