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

Commit b1e75f7b authored by Evan Rosky's avatar Evan Rosky
Browse files

Fix display-level windowingMode change 

This includes the following fixes:

It updates the ATM hierarchy and executes accumulated transitions
when display windowingMode changes. This was being skipped because
the mode change was being set on DC before reconfigureDisplayLocked.

Don't freeze the display when only window-effecting configs change

Don't cancel change transition on display change if the window
hasn't moved to a different display

Cancel change transition when app loses visibility.

Bug: 130755818
Test: Added test to AppChangeTransitionTests, manual test on chromeos
      for display windowing-mode change.
Change-Id: Ic1a0427f3e5ba940dc4c12765395e8ca050b0baf
parent c61a2510

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

+3 −1
Original line number Diff line number Diff line
@@ -2318,7 +2318,9 @@ final class ActivityRecord extends ConfigurationContainer { 
                return;

            }



            if (configChanges == 0 && mAppWindowToken.okToDisplay()) {

            // Window configuration changes only effect windows, so don't require a screen freeze.

            int freezableConfigChanges = configChanges & ~(CONFIG_WINDOW_CONFIGURATION);

            if (freezableConfigChanges == 0 && mAppWindowToken.okToDisplay()) {

                if (DEBUG_ORIENTATION) Slog.v(TAG_WM, "Skipping set freeze of " + appToken);

                return;

            }

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

+6 −2
Original line number Diff line number Diff line
@@ -508,6 +508,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        final DisplayContent displayContent = getDisplayContent();

        displayContent.mOpeningApps.remove(this);

        displayContent.mClosingApps.remove(this);

        if (isInChangeTransition()) {

            clearChangeLeash(getPendingTransaction(), true /* cancel */);

        }

        displayContent.mChangingApps.remove(this);

        waitingToShow = false;

        hiddenRequested = !visible;

        mDeferHidingClient = deferHidingClient;
@@ -1309,7 +1313,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
    void onDisplayChanged(DisplayContent dc) {

        DisplayContent prevDc = mDisplayContent;

        super.onDisplayChanged(dc);

        if (prevDc == null) {

        if (prevDc == null || prevDc == mDisplayContent) {

            return;

        }

        if (prevDc.mChangingApps.contains(this)) {
@@ -1332,7 +1336,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
            }

        }



        if (prevDc != mDisplayContent && mLetterbox != null) {

        if (mLetterbox != null) {

            mLetterbox.onMovedToDisplay(mDisplayContent.getDisplayId());

        }

    }

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

+17 −0
Original line number Diff line number Diff line
@@ -6776,9 +6776,26 @@ public class WindowManagerService extends IWindowManager.Stub 
                return;

            }



            int lastWindowingMode = displayContent.getWindowingMode();

            mDisplayWindowSettings.setWindowingModeLocked(displayContent, mode);



            reconfigureDisplayLocked(displayContent);



            if (lastWindowingMode != displayContent.getWindowingMode()) {

                // reconfigure won't detect this change in isolation because the windowing mode is

                // already set on the display, so fire off a new config now.

                mH.removeMessages(H.SEND_NEW_CONFIGURATION);



                final long origId = Binder.clearCallingIdentity();

                try {

                    // direct call since lock is shared.

                    sendNewConfiguration(displayId);

                } finally {

                    Binder.restoreCallingIdentity(origId);

                }

                // Now that all configurations are updated, execute pending transitions

                displayContent.executeAppTransition();

            }

        }

    }

services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java

+18 −0
Original line number Diff line number Diff line
@@ -154,4 +154,22 @@ public class AppChangeTransitionTests extends WindowTestsBase { 
        waitUntilHandlersIdle();

        mToken.removeImmediately();

    }



    @Test

    public void testCancelPendingChangeOnHide() {

        // setup currently defaults to no snapshot.

        setUpOnDisplay(mDisplayContent);



        mTask.setWindowingMode(WINDOWING_MODE_FREEFORM);

        assertEquals(1, mDisplayContent.mChangingApps.size());

        assertTrue(mToken.isInChangeTransition());



        // Changing visibility should cancel the change transition and become closing

        mToken.setVisibility(false, false);

        assertEquals(0, mDisplayContent.mChangingApps.size());

        assertFalse(mToken.isInChangeTransition());



        waitUntilHandlersIdle();

        mToken.removeImmediately();

    }

}