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

Commit ad4e58bb authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary calculation of display configuration" into tm-qpr-dev am: 9fefe95b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17775844



Change-Id: Ib86d6b2de54b3bd508ef683d9690d1adf6eeb887
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0eb2c42 9fefe95b

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

+0 −18
Original line number Diff line number Diff line
@@ -1614,24 +1614,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            }

            config = new Configuration();

            computeScreenConfiguration(config);

        } else if (!(mTransitionController.isCollecting(this)

                // If waiting for a remote display change, don't prematurely update configuration.

                || mRemoteDisplayChangeController.isWaitingForRemoteDisplayChange())) {

            // No obvious action we need to take, but if our current state mismatches the

            // activity manager's, update it, disregarding font scale, which should remain set

            // to the value of the previous configuration.

            // Here we're calling Configuration#unset() instead of setToDefaults() because we

            // need to keep override configs clear of non-empty values (e.g. fontSize).

            final Configuration currentConfig = getRequestedOverrideConfiguration();

            mTmpConfiguration.unset();

            mTmpConfiguration.updateFrom(currentConfig);

            computeScreenConfiguration(mTmpConfiguration);

            if (currentConfig.diff(mTmpConfiguration) != 0) {

                mWaitingForConfig = true;

                setLayoutNeeded();

                mDisplayRotation.prepareNormalRotationAnimation();

                config = new Configuration(mTmpConfiguration);

            }

        }



        return config;

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

+1 −0
Original line number Diff line number Diff line
@@ -2993,6 +2993,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
        // Add a decor insets provider window.

        final WindowState navbar = createNavBarWithProvidedInsets(squareDisplay);

        squareDisplay.getDisplayPolicy().updateDecorInsetsInfoIfNeeded(navbar);

        squareDisplay.sendNewConfiguration();

        final Task task = new TaskBuilder(mSupervisor).setDisplay(squareDisplay).build();



        // create a fixed portrait activity

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

+1 −4
Original line number Diff line number Diff line
@@ -220,10 +220,7 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { 
        // Check that changes are reported

        Configuration c = new Configuration(newDisp1.getRequestedOverrideConfiguration());

        c.windowConfiguration.setBounds(new Rect(0, 0, 1000, 1300));

        newDisp1.onRequestedOverrideConfigurationChanged(c);

        mAtm.mRootWindowContainer.ensureVisibilityAndConfig(null /* starting */,

                newDisp1.mDisplayId, false /* markFrozenIfConfigChanged */,

                false /* deferResume */);

        newDisp1.performDisplayOverrideConfigUpdate(c);

        assertEquals(0, added.size());

        assertEquals(1, changed.size());

        assertEquals(0, removed.size());