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

Commit c5f95fb5 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Update config from ancestor if it can handle orientation request 

When calling Activity#setRequestedOrientation, the orientation of task
may not be updated yet. If the requested orientation are mismatched,
the configuration could be letterboxed (unresizable activity) according
to the intermediate state. And because WindowProcessController may be a
configuration listener of the activity, the app may receive unexpected
configuration and keep calling setRequestedOrientation to cause a
relaunch loop.

Now the direct onConfigurationChanged from setOrientation is only
called when:
 - In multi window mode: if the activity is unresizable, its requested
   orientation should be still respected to compute letterboxed bounds
   if needed. Otherwise the orientation is ignored for resizable.
 - The ancestor ignores orientation request from descendant, e.g. in a
   fixed orientation display.

This should save an extra onConfigurationChanged for the most common
case in fullscreen windowing mode.

Fixes: 169349616
Test: atest WindowContainerTests#testSetOrientation

Change-Id: I49ba2003699422a491c1183b10a691e25867ffa7
parent aa36363f

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

+8 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,14 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        mOrientation = orientation;

        final WindowContainer parent = getParent();

        if (parent != null) {

            if (getConfiguration().orientation != getRequestedConfigurationOrientation()) {

            if (getConfiguration().orientation != getRequestedConfigurationOrientation()

                    // Update configuration directly only if the change won't be dispatched from

                    // ancestor. This prevents from computing intermediate configuration when the

                    // parent also needs to be updated from the ancestor. E.g. the app requests

                    // portrait but the task is still in landscape. While updating from display,

                    // the task can be updated to portrait first so the configuration can be

                    // computed in a consistent environment.

                    && (inMultiWindowMode() || !handlesOrientationChangeFromDescendant())) {

                // Resolve the requested orientation.

                onConfigurationChanged(parent.getConfiguration());

            }

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

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm;



import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
@@ -633,6 +634,22 @@ public class WindowContainerTests extends WindowTestsBase { 
        assertEquals(SCREEN_ORIENTATION_PORTRAIT, root.getOrientation());

    }



    @Test

    public void testSetOrientation() {

        final TestWindowContainer root = spy(new TestWindowContainerBuilder(mWm).build());

        final TestWindowContainer child = spy(root.addChildWindow());

        doReturn(true).when(root).handlesOrientationChangeFromDescendant();

        child.getWindowConfiguration().setWindowingMode(WINDOWING_MODE_FULLSCREEN);

        child.setOrientation(SCREEN_ORIENTATION_PORTRAIT);

        // The ancestor should decide whether to dispatch the configuration change.

        verify(child, never()).onConfigurationChanged(any());



        doReturn(false).when(root).handlesOrientationChangeFromDescendant();

        child.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

        // The ancestor doesn't handle the request so the descendant applies the change directly.

        verify(child).onConfigurationChanged(any());

    }



    @Test

    public void testCompareTo() {

        final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm);