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

Commit bd247cbe authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Abort a pending failed pip-enter transition" into udc-qpr-dev

parents eec5b865 e72e6a9f

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

+3 −0
Original line number Diff line number Diff line
@@ -3643,6 +3643,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            synchronized (mGlobalLock) {

                if (r.getParent() == null) {

                    Slog.e(TAG, "Skip enterPictureInPictureMode, destroyed " + r);

                    if (transition != null) {

                        transition.abort();

                    }

                    return;

                }

                EventLogTags.writeWmEnterPip(r.mUserId, System.identityHashCode(r),