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

Commit 4136db26 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Ignore orientation from invisible non-activity window 

This restores the orientation condition as in Q. Otherwise the
display orientation may still be controlled by an invisible
overlay window (e.g. its root view has set View.GONE) .

Bug: 169468732
Test: DisplayAreaTest#testGetOrientation
Change-Id: I517be9fb135eeb69722054e6191ef500f2f47da9
parent 2bfca138

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

+4 −0
Original line number Diff line number Diff line
@@ -370,6 +370,9 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 
                Comparator.comparingInt(WindowToken::getWindowLayerFromType);



        private final Predicate<WindowState> mGetOrientingWindow = w -> {

            if (!w.isVisible() || !w.mLegacyPolicyVisibilityAfterAnim) {

                return false;

            }

            final WindowManagerPolicy policy = mWmService.mPolicy;

            if (policy.isKeyguardHostWindow(w.mAttrs)) {

                if (mWmService.mKeyguardGoingAway) {
@@ -405,6 +408,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 


        @Override

        int getOrientation(int candidate) {

            mLastOrientationSource = null;

            // Find a window requesting orientation.

            final WindowState win = getWindow(mGetOrientingWindow);

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

+2 −1
Original line number Diff line number Diff line
@@ -2744,8 +2744,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
            pw.print(prefix); pw.println("ContainerAnimator:");

            mSurfaceAnimator.dump(pw, prefix + "  ");

        }

        if (mLastOrientationSource != null) {

        if (mLastOrientationSource != null && this == mDisplayContent) {

            pw.println(prefix + "mLastOrientationSource=" + mLastOrientationSource);

            pw.println(prefix + "deepestLastOrientationSource=" + getLastOrientationSource());

        }

    }

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

+40 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; 
import static android.window.DisplayAreaOrganizer.FEATURE_DEFAULT_TASK_CONTAINER;

import static android.window.DisplayAreaOrganizer.FEATURE_VENDOR_FIRST;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.server.wm.DisplayArea.Type.ABOVE_TASKS;

import static com.android.server.wm.DisplayArea.Type.ANY;
@@ -37,14 +39,18 @@ import static com.android.server.wm.testing.Assert.assertThrows; 
import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyZeroInteractions;



import android.content.pm.ActivityInfo;

import android.graphics.Rect;

import android.os.Binder;

import android.platform.test.annotations.Presubmit;

import android.view.SurfaceControl;

import android.view.View;

import android.view.WindowManager;



import com.google.android.collect.Lists;
@@ -405,6 +411,33 @@ public class DisplayAreaTest { 
                childBounds1, windowToken.getMaxBounds());

    }



    @Test

    public void testGetOrientation() {

        final DisplayArea.Tokens area = new DisplayArea.Tokens(mWms, ABOVE_TASKS, "test");

        final WindowToken token = createWindowToken(TYPE_APPLICATION_OVERLAY);

        spyOn(token);

        doReturn(mock(DisplayContent.class)).when(token).getDisplayContent();

        doNothing().when(token).setParent(any());

        final WindowState win = createWindowState(token);

        spyOn(win);

        doNothing().when(win).setParent(any());

        win.mAttrs.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

        token.addChild(win, 0);

        area.addChild(token);



        doReturn(true).when(win).isVisible();



        assertEquals("Visible window can request orientation",

                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,

                area.getOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR));



        doReturn(false).when(win).isVisible();



        assertEquals("Invisible window cannot request orientation",

                ActivityInfo.SCREEN_ORIENTATION_NOSENSOR,

                area.getOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR));

    }



    private static class TestDisplayArea<T extends WindowContainer> extends DisplayArea<T> {

        private TestDisplayArea(WindowManagerService wms, Rect bounds) {

            super(wms, ANY, "half display area");
@@ -417,6 +450,13 @@ public class DisplayAreaTest { 
        }

    }



    private WindowState createWindowState(WindowToken token) {

        return new WindowState(mWms, mock(Session.class), new TestIWindow(), token,

                null /* parentWindow */, 0 /* appOp */, new WindowManager.LayoutParams(),

                View.VISIBLE, 0 /* ownerId */, 0 /* showUserId */,

                false /* ownerCanAddInternalSystemWindow */);

    }



    private WindowToken createWindowToken(int type) {

        return new WindowToken(mWmsRule.getWindowManagerService(), new Binder(),

                type, false /* persist */, null /* displayContent */,