Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 221036d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Transition: fix NPE problem." into main am: bf6919ec am: 35e03999 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3438659



Change-Id: Ic0580d28de3baafbf943004843c152372d177c05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc45bb2c 35e03999

services/core/java/com/android/server/wm/Transition.java

+1 −0
Original line number Diff line number Diff line
@@ -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.");