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

Commit 984dcc4b authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Always abort a rejected multiwindow request" into udc-qpr-dev am: b476c59d am: 8fd80a3b 

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



Change-Id: I6f2980d1b54b54b2a909ca9296df16a2f746bda0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6276d843 8fd80a3b

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

+1 −3
Original line number Diff line number Diff line
@@ -1170,9 +1170,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
                fullscreenRequest, r);

        reportMultiwindowFullscreenRequestValidatingResult(callback, validateResult);

        if (validateResult != RESULT_APPROVED) {

            if (queued) {

            transition.abort();

            }

            return;

        }

        transition.collect(topFocusedRootTask);

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

+5 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            return;

        }



        if (mState != STATE_STARTED) {

            Slog.e(TAG, "Playing a Transition which hasn't started! #" + mSyncId + " This will "

                    + "likely cause an exception in Shell");

        }



        mState = STATE_PLAYING;

        mStartTransaction = transaction;

        mFinishTransaction = mController.mAtm.mWindowManager.mTransactionFactory.get();