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

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

Merge "Always abort a rejected multiwindow request" into udc-qpr-dev

parents fcc8bbe3 468d81d0

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

+1 −3
Original line number Diff line number Diff line
@@ -1162,9 +1162,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
@@ -1486,6 +1486,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();