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

Commit 9f74446c authored by Kazuki Takise's avatar Kazuki Takise
Browse files

Don't restart SCM apps when moved between displays 

Density and colorMode are already sandboxed in SCM to prevent apps
in SCM from being restart when moved between displays, but there
are some other factors that could change and affect activity
restart.

Flag: com.android.window.flags.enable_size_compat_mode_improvements_for_connected_displays
Bug: 399749909
Test: SizeCompatTest#testFixedScreenConfigurationWhenMovingToDisplay
Change-Id: I9876fccda2e08a9cc97e4963290c6f05516f90f6
parent e8f603c4

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

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.content.pm.ActivityInfo.SIZE_CHANGES_UNSUPPORTED_METADATA; 
import static android.content.pm.ActivityInfo.SIZE_CHANGES_UNSUPPORTED_OVERRIDE;

import static android.content.res.Configuration.ORIENTATION_UNDEFINED;



import static com.android.window.flags.Flags.enableSizeCompatModeImprovementsForConnectedDisplays;

import static com.android.server.wm.AppCompatUtils.isInDesktopMode;



import android.annotation.NonNull;
@@ -357,6 +358,11 @@ class AppCompatSizeCompatModePolicy { 
        // relatively fixed.

        overrideConfig.colorMode = fullConfig.colorMode;

        overrideConfig.densityDpi = fullConfig.densityDpi;

        if (enableSizeCompatModeImprovementsForConnectedDisplays()) {

            overrideConfig.touchscreen = fullConfig.touchscreen;

            overrideConfig.navigation = fullConfig.navigation;

            overrideConfig.fontScale = fullConfig.fontScale;

        }

        // The smallest screen width is the short side of screen bounds. Because the bounds

        // and density won't be changed, smallestScreenWidthDp is also fixed.

        overrideConfig.smallestScreenWidthDp = fullConfig.smallestScreenWidthDp;

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

+37 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_POSITION_MU 
import static com.android.server.wm.AppCompatUtils.computeAspectRatio;

import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;

import static com.android.server.wm.WindowContainer.POSITION_TOP;

import static com.android.window.flags.Flags.FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS;



import static com.google.common.truth.Truth.assertThat;
@@ -109,6 +110,7 @@ import android.provider.DeviceConfig; 
import android.provider.DeviceConfig.Properties;

import android.view.DisplayCutout;

import android.view.DisplayInfo;

import android.view.InputDevice;

import android.view.InsetsFrameProvider;

import android.view.InsetsSource;

import android.view.InsetsState;
@@ -561,6 +563,41 @@ public class SizeCompatTests extends WindowTestsBase { 
        assertDownScaled();

    }



    @EnableFlags(FLAG_ENABLE_SIZE_COMPAT_MODE_IMPROVEMENTS_FOR_CONNECTED_DISPLAYS)

    @Test

    public void testFixedMiscConfigurationWhenMovingToDisplay() {

        setUpDisplaySizeWithApp(1000, 2500);



        final DisplayContent newDisplay =

                new TestDisplayContent.Builder(mAtm, 1000, 2000).build();

        final InputDevice device = new InputDevice.Builder()

                .setAssociatedDisplayId(newDisplay.mDisplayId)

                .setSources(InputDevice.SOURCE_TOUCHSCREEN | InputDevice.SOURCE_TRACKBALL

                        | InputDevice.KEYBOARD_TYPE_ALPHABETIC)

                .build();

        final InputDevice[] devices = {device};

        doReturn(true).when(newDisplay.mWmService.mInputManager)

                .canDispatchToDisplay(device.getId(), newDisplay.mDisplayId);

        doReturn(devices).when(newDisplay.mWmService.mInputManager).getInputDevices();

        mTask.mWmService.mIsTouchDevice = true;

        mTask.mWmService.displayReady();



        prepareUnresizable(mActivity, 1.5f /* maxAspect */, SCREEN_ORIENTATION_UNSPECIFIED);



        final Configuration originalConfiguration = mActivity.getConfiguration();

        final int originalTouchscreen = originalConfiguration.touchscreen;

        final int originalNavigation = originalConfiguration.navigation;

        final int originalKeyboard = originalConfiguration.keyboard;



        // Move the non-resizable activity to the new display.

        mTask.reparent(newDisplay.getDefaultTaskDisplayArea(), true /* onTop */);



        final Configuration newConfiguration = mActivity.getConfiguration();

        assertEquals(originalTouchscreen, newConfiguration.touchscreen);

        assertEquals(originalNavigation, newConfiguration.navigation);

        assertEquals(originalKeyboard, newConfiguration.keyboard);

    }



    @Test

    public void testFixedScreenBoundsWhenDisplaySizeChanged() {

        setUpDisplaySizeWithApp(1000, 2500);