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

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

Reduce unnecessary config propagation of default display 

Global config is also the override config of default display.
When updating the override config, the hierarchy is already notified.
So it doesn't need to update twice. Previously, the first update
from mRootWindowContainer.onConfigurationChanged only recomputes
the old config again because the override doesn't change.

This may reduce up to 3ms (depends on the amount of window
container in default display).

Also remove unused parameter deferResume.

Bug: 159103089
Bug: 178472794
Test: CtsWindowManagerDeviceTestCases
Change-Id: I1437a26e435666c13faaf27e0b0ef81adf739fe0
parent 38ab224e

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

+8 −17
Original line number Diff line number Diff line
@@ -4005,8 +4005,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        deferWindowLayout();

        try {

            if (values != null) {

                changes = updateGlobalConfigurationLocked(values, initLocale, persistent, userId,

                        deferResume);

                changes = updateGlobalConfigurationLocked(values, initLocale, persistent, userId);

            }



            if (!deferResume) {
@@ -4025,7 +4024,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


    /** Update default (global) configuration and notify listeners about changes. */

    int updateGlobalConfigurationLocked(@NonNull Configuration values, boolean initLocale,

            boolean persistent, int userId, boolean deferResume) {

            boolean persistent, int userId) {



        final DisplayContent defaultDisplay =

                mRootWindowContainer.getDisplayContent(DEFAULT_DISPLAY);
@@ -4037,7 +4036,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            // setting WindowManagerService.mWaitingForConfig to true, it is important that we call

            // performDisplayOverrideConfigUpdate in order to send the new display configuration

            // (even if there are no actual changes) to unfreeze the window.

            defaultDisplay.performDisplayOverrideConfigUpdate(values, deferResume);

            defaultDisplay.performDisplayOverrideConfigUpdate(values);

            return 0;

        }
@@ -4085,9 +4084,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


        mTempConfig.seq = increaseConfigurationSeqLocked();



        // Update stored global config and notify everyone about the change.

        mRootWindowContainer.onConfigurationChanged(mTempConfig);



        Slog.i(TAG, "Config changes=" + Integer.toHexString(changes) + " " + mTempConfig);

        // TODO(multi-display): Update UsageEvents#Event to include displayId.

        mUsageStatsInternal.reportConfigurationChange(mTempConfig, mAmInternal.getCurrentUserId());
@@ -4106,13 +4102,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        // resources have that config before following boot code is executed.

        mSystemThread.applyConfigurationToResources(mTempConfig);



        // We need another copy of global config because we're scheduling some calls instead of

        // running them in place. We need to be sure that object we send will be handled unchanged.

        final Configuration configCopy = new Configuration(mTempConfig);

        if (persistent && Settings.System.hasInterestingConfigurationChanges(changes)) {

            final Message msg = PooledLambda.obtainMessage(

                    ActivityTaskManagerService::sendPutConfigurationForUserMsg,

                    this, userId, configCopy);

                    this, userId, new Configuration(mTempConfig));

            mH.sendMessage(msg);

        }
@@ -4121,8 +4114,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            final int pid = pidMap.keyAt(i);

            final WindowProcessController app = pidMap.get(pid);

            ProtoLog.v(WM_DEBUG_CONFIGURATION, "Update process config of %s to new "

                    + "config %s", app.mName, configCopy);

            app.onConfigurationChanged(configCopy);

                    + "config %s", app.mName, mTempConfig);

            app.onConfigurationChanged(mTempConfig);

        }



        final Message msg = PooledLambda.obtainMessage(
@@ -4130,10 +4123,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                mAmInternal, changes, initLocale);

        mH.sendMessage(msg);



        // Override configuration of the default display duplicates global config, so we need to

        // update it also. This will also notify WindowManager about changes.

        defaultDisplay.performDisplayOverrideConfigUpdate(mRootWindowContainer.getConfiguration(),

                deferResume);

        // Update stored global config and notify everyone about the change.

        mRootWindowContainer.onConfigurationChanged(mTempConfig);



        return changes;

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
            mChangeListeners.get(i).onMergedOverrideConfigurationChanged(

                    mMergedOverrideConfiguration);

        }

        dispatchConfigurationToChildren();

    }



    void dispatchConfigurationToChildren() {

        for (int i = getChildCount() - 1; i >= 0; --i) {

            final ConfigurationContainer child = getChildAt(i);

            child.onConfigurationChanged(mFullConfiguration);

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

+3 −3
Original line number Diff line number Diff line
@@ -5467,9 +5467,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                    // apply the correct override config.

                    changes = mAtmService.updateGlobalConfigurationLocked(values,

                            false /* initLocale */, false /* persistent */,

                            UserHandle.USER_NULL /* userId */, deferResume);

                            UserHandle.USER_NULL /* userId */);

                } else {

                    changes = performDisplayOverrideConfigUpdate(values, deferResume);

                    changes = performDisplayOverrideConfigUpdate(values);

                }

            }
@@ -5487,7 +5487,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        return kept;

    }



    int performDisplayOverrideConfigUpdate(Configuration values, boolean deferResume) {

    int performDisplayOverrideConfigUpdate(Configuration values) {

        mTempConfig.setTo(getRequestedOverrideConfiguration());

        final int changes = mTempConfig.updateFrom(values);

        if (changes != 0) {

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

+14 −0
Original line number Diff line number Diff line
@@ -649,6 +649,20 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        onConfigurationChanged(newConfiguration);

    }



    @Override

    void dispatchConfigurationToChildren() {

        final Configuration configuration = getConfiguration();

        for (int i = getChildCount() - 1; i >= 0; i--) {

            final DisplayContent displayContent = getChildAt(i);

            if (displayContent.isDefaultDisplay) {

                // The global configuration is also the override configuration of default display.

                displayContent.performDisplayOverrideConfigUpdate(configuration);

            } else {

                displayContent.onConfigurationChanged(configuration);

            }

        }

    }



    @Override

    public void onConfigurationChanged(Configuration newParentConfig) {

        prepareFreezingTaskBounds();