diff options
| author | 2025-01-07 20:21:15 -0800 | |
|---|---|---|
| committer | 2025-01-07 20:21:15 -0800 | |
| commit | 221036d754d685ba1694ca31b4b3be437ebb49f1 (patch) | |
| tree | 2a051e550a5473f074d39331b3e2dd318fafdfc2 | |
| parent | cc45bb2c470dc4332cc7912cb582f48d68d08561 (diff) | |
| parent | 35e03999136b362fad68529e34b7ab8025c1c0c2 (diff) | |
Merge "Transition: fix NPE problem." into main am: bf6919ec0e am: 35e0399913
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3438659
Change-Id: Ic0580d28de3baafbf943004843c152372d177c05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index f0faa8e4691f..a9646783b92d 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1412,6 +1412,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { if (!tr.isAttached() || !tr.isVisibleRequested() || !tr.inPinnedWindowingMode()) return; final ActivityRecord currTop = tr.getTopNonFinishingActivity(); + if (currTop == null) return; if (currTop.inPinnedWindowingMode()) return; Slog.e(TAG, "Enter-PIP was started but not completed, this is a Shell/SysUI" + " bug. This state breaks gesture-nav, so attempting clean-up."); |