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

Commit 5c29e640 authored by Marin Shalamanov's avatar Marin Shalamanov
Browse files

Fix density issues when maxUiWidth is set 

Currently the code assumes that display size and density are
forced if and only if the mBase* values are different from
the mInitial* values. This is incorrect because base size
and density may not be forced but a result of applying
the maxUiWidth property.

Assuming the restricted density is forced makes
updateBaseDisplayMetricsIfNeeded() always pick it instead of
"newDensity". As result of that if we have maxUiWidth=1920 each
time we set a 4k mode the density will double as a result of the
calculations in updateBaseDisplayMetrics().

The same problem occurs with `adb shell wm size 3840x2160`,
because setForcedSize() assumes mBaseDensity should be used.
Instead this change picks a density which preserves the ratio
density/width constant.

Test: manually tested the abovementioned scenarios
Bug: 156100799
Change-Id: I8bda1b9883307fe94fed50be4a874b153e743a8f
parent 8a18aaaf

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

+10 −12
Original line number Diff line number Diff line
@@ -310,12 +310,14 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis 
     */

    int mBaseDisplayWidth = 0;

    int mBaseDisplayHeight = 0;

    boolean mIsSizeForced = false;

    /**

     * Overridden display density for current user. Initialized with {@link #mInitialDisplayDensity}

     * but can be set from Settings or via shell command "adb shell wm density".

     * @see WindowManagerService#setForcedDisplayDensityForUser(int, int, int)

     */

    int mBaseDisplayDensity = 0;

    boolean mIsDensityForced = false;



    /**

     * Whether to disable display scaling. This can be set via shell command "adb shell wm scaling".
@@ -2376,15 +2378,10 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis 
                || !Objects.equals(mInitialDisplayCutout, newCutout);



        if (displayMetricsChanged) {

            // Check if display size or density is forced.

            final boolean isDisplaySizeForced = mBaseDisplayWidth != mInitialDisplayWidth

                    || mBaseDisplayHeight != mInitialDisplayHeight;

            final boolean isDisplayDensityForced = mBaseDisplayDensity != mInitialDisplayDensity;



            // If there is an override set for base values - use it, otherwise use new values.

            updateBaseDisplayMetrics(isDisplaySizeForced ? mBaseDisplayWidth : newWidth,

                    isDisplaySizeForced ? mBaseDisplayHeight : newHeight,

                    isDisplayDensityForced ? mBaseDisplayDensity : newDensity);

            updateBaseDisplayMetrics(mIsSizeForced ? mBaseDisplayWidth : newWidth,

                    mIsSizeForced ? mBaseDisplayHeight : newHeight,

                    mIsDensityForced ? mBaseDisplayDensity : newDensity);



            // Real display metrics changed, so we should also update initial values.

            mInitialDisplayWidth = newWidth;
@@ -2440,6 +2437,7 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis 
     *               so only need to configure display.

     */

    void setForcedDensity(int density, int userId) {

        mIsDensityForced = density != mInitialDisplayDensity;

        final boolean updateCurrent = userId == UserHandle.USER_CURRENT;

        if (mWmService.mCurrentUserId == userId || updateCurrent) {

            mBaseDisplayDensity = density;
@@ -2471,8 +2469,8 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis 


    /** If the given width and height equal to initial size, the setting will be cleared. */

    void setForcedSize(int width, int height) {

        final boolean clear = mInitialDisplayWidth == width && mInitialDisplayHeight == height;

        if (!clear) {

        mIsSizeForced = mInitialDisplayWidth != width || mInitialDisplayHeight != height;

        if (mIsSizeForced) {

            // Set some sort of reasonable bounds on the size of the display that we will try

            // to emulate.

            final int minSize = 200;
@@ -2482,10 +2480,10 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis 
        }



        Slog.i(TAG_WM, "Using new display size: " + width + "x" + height);

        updateBaseDisplayMetrics(width, height, mBaseDisplayDensity);

        updateBaseDisplayMetrics(width, height, width * mBaseDisplayDensity / mBaseDisplayWidth);

        reconfigureDisplayLocked();



        if (clear) {

        if (!mIsSizeForced) {

            width = height = 0;

        }

        mWmService.mDisplayWindowSettings.setForcedSize(this, width, height);