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

Commit b4fe58c2 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Refine calls related to process global configuration 

updateFrom is an expensive method, and we want to avoid it if possible.
If a process has not register to any display as a configuration change
listener, we do not need to do the manual merge in getConfiguration.

Another improvement is, as getGlobalConfiguration returns the
mFullConfiguration itself without copy, getProcessGlobalConfiguration
should be safe to do the same thing. Remove the copy to furthur
accelerate the related calls. But make a copy before changing it in
getConfiguration.

Test: go/wm-smoke
Test: ddms shows a great performance improvement
Test: atest com.android.uibench.janktests.UiBenchJankTests
Bug: 129269005
Bug: 129389526
Change-Id: Ie560917d57932e58bf1db796814eb1c519706f35
parent d711ed30

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

+5 −0
Original line number Diff line number Diff line
@@ -297,6 +297,11 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
        return mPendingUiClean;

    }



    /** @return {@code true} if the process registered to a display as a config listener. */

    boolean registeredForDisplayConfigChanges() {

        return mDisplayId != INVALID_DISPLAY;

    }



    void postPendingUiCleanMsg(boolean pendingUiClean) {

        if (mListener == null) return;

        // Posting on handler so WM lock isn't held when we call into AM.

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

+26 −8
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import static android.view.WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_FREEFO 
import static android.view.WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME;

import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED;



import static com.android.server.am.ActivityManagerService.MY_PID;

import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;

import static com.android.server.policy.WindowManagerPolicy.TRANSIT_ENTER;

import static com.android.server.policy.WindowManagerPolicy.TRANSIT_EXIT;
@@ -2349,12 +2350,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    private Configuration getProcessGlobalConfiguration() {

        // For child windows we want to use the pid for the parent window in case the the child

        // window was added from another process.

        final int pid = getParentWindow() != null ? getParentWindow().mSession.mPid : mSession.mPid;

        final WindowState parentWindow = getParentWindow();

        final int pid = parentWindow != null ? parentWindow.mSession.mPid : mSession.mPid;

        final Configuration processConfig =

                mWmService.mAtmService.getGlobalConfigurationForPid(pid);

        mTempConfiguration.setTo(processConfig == null

                ? mWmService.mRoot.getConfiguration() : processConfig);

        return mTempConfiguration;

        return processConfig;

    }



    void getMergedConfiguration(MergedConfiguration outConfiguration) {
@@ -2989,11 +2989,29 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            return mAppToken.mFrozenMergedConfig.peek();

        }



        // If the process has not registered to any display to listen to the configuration change,

        // we can simply return the mFullConfiguration as default.

        if (!registeredForDisplayConfigChanges()) {

            return super.getConfiguration();

        }



        // We use the process config this window is associated with as the based global config since

        // the process can override it config, but isn't part of the window hierarchy.

        final Configuration config = getProcessGlobalConfiguration();

        config.updateFrom(getMergedOverrideConfiguration());

        return config;

        // the process can override its config, but isn't part of the window hierarchy.

        mTempConfiguration.setTo(getProcessGlobalConfiguration());

        mTempConfiguration.updateFrom(getMergedOverrideConfiguration());

        return mTempConfiguration;

    }



    /** @return {@code true} if the process registered to a display as a config listener. */

    private boolean registeredForDisplayConfigChanges() {

        final WindowState parentWindow = getParentWindow();

        final Session session = parentWindow != null ? parentWindow.mSession : mSession;

        // System process or invalid process cannot register to display config change.

        if (session.mPid == MY_PID || session.mPid < 0) return false;

        WindowProcessController app =

                mWmService.mAtmService.getProcessController(session.mPid, session.mUid);

        if (app == null || !app.registeredForDisplayConfigChanges()) return false;

        return true;

    }



    void reportResized() {