diff options
| author | 2022-12-01 07:13:44 +0000 | |
|---|---|---|
| committer | 2022-12-01 07:13:44 +0000 | |
| commit | 2a23c2e341e5211626b0b28c4cccfb3d10fddbc9 (patch) | |
| tree | 0d9d31577944145ef2b9b3cb1cb773c6f1e26591 | |
| parent | daa91b75820b4265ccfe0f4924ab7eb890867112 (diff) | |
| parent | 4733e7031a82d65e0286c76be518a58d1551d97c (diff) | |
Merge "Fix NPE from startNewTransition" into tm-qpr-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 3 |
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 9d518df5ccbe..ec3962c282f6 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) { |