summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2022-11-30 18:15:24 +0800
committer Riddle Hsu <riddlehsu@google.com> 2022-11-30 18:15:24 +0800
commit4733e7031a82d65e0286c76be518a58d1551d97c (patch)
tree8a39c896ee7fb38780cf9374e22ba1e33706f3ff
parentb18b7e97cec6ddfa61e7d3b1db319a1a808dbcff (diff)
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
-rw-r--r--services/core/java/com/android/server/wm/Transition.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 7ce17d422386..c1f0a5fb708f 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) {