diff options
| author | 2025-01-07 19:56:42 -0800 | |
|---|---|---|
| committer | 2025-01-07 19:56:42 -0800 | |
| commit | 35e03999136b362fad68529e34b7ab8025c1c0c2 (patch) | |
| tree | 086d1dc9e62b2effe0fb061a03c6834c429171ec | |
| parent | 1211544ba3c665601a1406302187f29ee74c9297 (diff) | |
| parent | bf6919ec0eff5482413fbd2a756d2d2064de78c5 (diff) | |
Merge "Transition: fix NPE problem." into main am: bf6919ec0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3438659
Change-Id: I6074a88e4f779de2ad2d91cf2715eb97934f6de8
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 dd5f6134e2eb..1058a2561ddc 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1371,6 +1371,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."); |