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

Commit 50bfc33f authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Optimize initialization of configuration when display ready" into main

parents 56f71365 c1ce8e58

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

+6 −7
Original line number Diff line number Diff line
@@ -5241,16 +5241,17 @@ public class WindowManagerService extends IWindowManager.Stub 
            applyForcedPropertiesForDefaultDisplay();

            mAnimator.ready();

            mDisplayReady = true;

            // Reconfigure all displays to make sure that forced properties and

            // DisplayWindowSettings are applied.

            mRoot.forAllDisplays(DisplayContent::reconfigureDisplayLocked);

            mHasWideColorGamutSupport = queryWideColorGamutSupport();

            mHasHdrSupport = queryHdrSupport();

            mIsTouchDevice = mContext.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_TOUCHSCREEN);

            mIsFakeTouchDevice = mContext.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_FAKETOUCH);

            // Reconfigure all displays to make sure that the forced properties and

            // DisplayWindowSettings are applied. In addition, wide-color/hdr/isTouchDevice also

            // affect the Configuration.

            mRoot.forAllDisplays(DisplayContent::reconfigureDisplayLocked);

        }



        mAtmService.updateConfiguration(null /* request to compute config */);

    }



    public void systemReady() {
@@ -5258,8 +5259,6 @@ public class WindowManagerService extends IWindowManager.Stub 
        mPolicy.systemReady();

        mRoot.forAllDisplayPolicies(DisplayPolicy::systemReady);

        mSnapshotController.systemReady();

        mHasWideColorGamutSupport = queryWideColorGamutSupport();

        mHasHdrSupport = queryHdrSupport();

        UiThread.getHandler().post(mSettingsObserver::loadSettings);

        IVrManager vrManager = IVrManager.Stub.asInterface(

                ServiceManager.getService(Context.VR_SERVICE));