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

Commit 7022535a authored by petsjonkin's avatar petsjonkin
Browse files

Removing enable_restrict_display_modes flag 

Bug: b/409604990
Test: build
Flag: EXEMPT flag removal
Change-Id: Id0f8ae43e23642744ff5ccd96a0403fc2bf2c26a
parent 568bfcd1

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+0 −9
Original line number Diff line number Diff line
@@ -99,10 +99,6 @@ public class DisplayManagerFlags { 
            Flags.FLAG_BRIGHTNESS_INT_RANGE_USER_PERCEPTION,

            Flags::brightnessIntRangeUserPerception);



    private final FlagState mRestrictDisplayModes = new FlagState(

            Flags.FLAG_ENABLE_RESTRICT_DISPLAY_MODES,

            Flags::enableRestrictDisplayModes);



    private final FlagState mResolutionBackupRestore = new FlagState(

            Flags.FLAG_RESOLUTION_BACKUP_RESTORE,

            Flags::resolutionBackupRestore);
@@ -406,10 +402,6 @@ public class DisplayManagerFlags { 
        return mBrightnessIntRangeUserPerceptionFlagState.isEnabled();

    }



    public boolean isRestrictDisplayModesEnabled() {

        return mRestrictDisplayModes.isEnabled();

    }



    public boolean isResolutionBackupRestoreEnabled() {

        return mResolutionBackupRestore.isEnabled();

    }
@@ -683,7 +675,6 @@ public class DisplayManagerFlags { 
        pw.println(" " + mDisplayConfigErrorHalFlagState);

        pw.println(" " + mSyncedResolutionSwitch);

        pw.println(" " + mBrightnessIntRangeUserPerceptionFlagState);

        pw.println(" " + mRestrictDisplayModes);

        pw.println(" " + mBrightnessWearBedtimeModeClamperFlagState);

        pw.println(" " + mAutoBrightnessModesFlagState);

        pw.println(" " + mFastHdrTransitions);

services/core/java/com/android/server/display/feature/display_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -139,14 +139,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "enable_restrict_display_modes"

    namespace: "display_manager"

    description: "Feature flag for restriction display modes api"

    bug: "284866750"

    is_fixed_read_only: true

}



flag {

    name: "enable_vsync_low_power_vote"

    namespace: "display_manager"

services/core/java/com/android/server/display/mode/DisplayModeDirector.java

+14 −14
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ public class DisplayModeDirector { 
    private final SkinThermalStatusObserver mSkinThermalStatusObserver;

    private final ModeChangeObserver mModeChangeObserver;



    @Nullable

    private final SystemRequestObserver mSystemRequestObserver;

    private final DeviceConfigParameterProvider mConfigParameterProvider;

    private final DeviceConfigDisplaySettings mDeviceConfigDisplaySettings;
@@ -252,11 +251,7 @@ public class DisplayModeDirector { 
        mModeChangeObserver = new ModeChangeObserver(mVotesStorage, injector, handler.getLooper());

        mHbmObserver = new HbmObserver(injector, mVotesStorage, BackgroundThread.getHandler(),

                mDeviceConfigDisplaySettings);

        if (displayManagerFlags.isRestrictDisplayModesEnabled()) {

            mSystemRequestObserver = new SystemRequestObserver(mVotesStorage);

        } else {

            mSystemRequestObserver = null;

        }

        mSystemRequestObserver = mInjector.getSystemRequestObserver(mVotesStorage);

        mAlwaysRespectAppRequest = false;

        mSupportsFrameRateOverride = injector.supportsFrameRateOverride();

    }
@@ -573,7 +568,6 @@ public class DisplayModeDirector { 
     * Delegates requestDisplayModes call to SystemRequestObserver

     */

    public void requestDisplayModes(IBinder token, int displayId, int[] modeIds) {

        if (mSystemRequestObserver != null) {

        boolean vrrSupported;

        synchronized (mLock) {

            vrrSupported = isVrrSupportedLocked(displayId);
@@ -582,7 +576,6 @@ public class DisplayModeDirector { 
            mSystemRequestObserver.requestDisplayModes(token, displayId, modeIds);

        }

    }

    }



    /**

     * Called when the user switches.
@@ -3180,6 +3173,8 @@ public class DisplayModeDirector { 
        VotesStatsReporter getVotesStatsReporter();



        AmbientFilter getAmbientFilter(Resources res);



        SystemRequestObserver getSystemRequestObserver(VotesStorage votesStorage);

    }



    @VisibleForTesting
@@ -3334,6 +3329,11 @@ public class DisplayModeDirector { 
            return AmbientFilterFactory.createBrightnessFilter(TAG, res);

        }



        @Override

        public SystemRequestObserver getSystemRequestObserver(VotesStorage votesStorage) {

            return new SystemRequestObserver(votesStorage);

        }



        private DisplayManager getDisplayManager() {

            if (mDisplayManager == null) {

                mDisplayManager = mContext.getSystemService(DisplayManager.class);

services/tests/displayservicetests/src/com/android/server/display/mode/DisplayModeDirectorTest.java

+5 −0
Original line number Diff line number Diff line
@@ -4016,6 +4016,11 @@ public class DisplayModeDirectorTest { 
            return createLastValueAmbientFilter();

        }



        @Override

        public SystemRequestObserver getSystemRequestObserver(VotesStorage votesStorage) {

            return mock(SystemRequestObserver.class);

        }



        protected Display createDisplay(int id) {

            return new Display(DisplayManagerGlobal.getInstance(), id, mDisplayInfo,

                    ApplicationProvider.getApplicationContext().getResources());