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

Commit a092d820 authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Remove adaptive tone improvements 2 flag 

Bug: 409611310
Flag: EXEMPT flag removal
Test: atest DisplayServiceTests
Change-Id: I95b11be35cd680d9e329bfd89418c58dcbf5063b
parent 62be808e

services/core/java/com/android/server/display/color/DisplayWhiteBalanceTintController.java

+4 −10
Original line number Diff line number Diff line
@@ -145,16 +145,10 @@ final class DisplayWhiteBalanceTintController extends ColorTemperatureTintContro 


        mTransitionDuration = res.getInteger(

                R.integer.config_displayWhiteBalanceTransitionTime);



        if (!mDisplayManagerFlags.isAdaptiveTone2Enabled()) {

            mTransitionDurationDecrease = mTransitionDuration;

            mTransitionDurationIncrease = mTransitionDuration;

        } else {

        mTransitionDurationIncrease = res.getInteger(

                R.integer.config_displayWhiteBalanceTransitionTimeIncrease);

        mTransitionDurationDecrease = res.getInteger(

                R.integer.config_displayWhiteBalanceTransitionTimeDecrease);

        }



        int[] cctRangeMinimums = res.getIntArray(

                R.array.config_displayWhiteBalanceDisplayRangeMinimums);

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

+0 −12
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ public class DisplayManagerFlags { 
    // 'adb shell setprop persist.log.tag.DisplayManagerFlags DEBUG && adb reboot'

    private static final boolean DEBUG = DebugUtils.isDebuggable(TAG);



    private final FlagState mAdaptiveToneImprovements2 = new FlagState(

            Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_2,

            Flags::enableAdaptiveToneImprovements2);



    private final FlagState mDisplayOffloadFlagState = new FlagState(

            Flags.FLAG_ENABLE_DISPLAY_OFFLOAD,

            Flags::enableDisplayOffload);
@@ -293,13 +289,6 @@ public class DisplayManagerFlags { 
        return mPowerThrottlingClamperFlagState.isEnabled();

    }



    /**

     * Returns whether adaptive tone improvements are enabled

     */

    public boolean isAdaptiveTone2Enabled() {

        return mAdaptiveToneImprovements2.isEnabled();

    }



    /** Returns whether resolution range voting feature is enabled or not. */

    public boolean isDisplayResolutionRangeVotingEnabled() {

        return isExternalDisplayLimitModeEnabled();
@@ -598,7 +587,6 @@ public class DisplayManagerFlags { 
    public void dump(PrintWriter pw) {

        pw.println("DisplayManagerFlags:");

        pw.println("--------------------");

        pw.println(" " + mAdaptiveToneImprovements2);

        pw.println(" " + mBackUpSmoothDisplayAndForcePeakRefreshRateFlagState);

        pw.println(" " + mConnectedDisplayErrorHandlingFlagState);

        pw.println(" " + mDisplayOffloadFlagState);

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

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

}



flag {

    name: "enable_adaptive_tone_improvements_2"

    namespace: "display_manager"

    description: "Feature flag for Further Adaptive Tone Improvements"

    bug: "294762632"

    is_fixed_read_only: true

}



flag {

    name: "enable_display_resolution_range_voting"

    namespace: "display_manager"

services/tests/displayservicetests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java

+0 −14
Original line number Diff line number Diff line
@@ -367,21 +367,8 @@ public class DisplayWhiteBalanceTintControllerTest { 
                1e-6f /* tolerance */);

    }



    @Test

    public void testDisplayWhiteBalance_TransitionTimes() {

        when(mDisplayManagerFlagsMock.isAdaptiveTone2Enabled()).thenReturn(false);

        setUpTransitionTimes();

        setUpTintController();



        assertEquals(30L,

                mDisplayWhiteBalanceTintController.getTransitionDurationMilliseconds(true));

        assertEquals(30L,

                mDisplayWhiteBalanceTintController.getTransitionDurationMilliseconds(false));

    }



    @Test

    public void testDisplayWhiteBalance_TransitionTimesDirectional() {

        when(mDisplayManagerFlagsMock.isAdaptiveTone2Enabled()).thenReturn(true);

        setUpTransitionTimes();

        setUpTintController();
@@ -391,7 +378,6 @@ public class DisplayWhiteBalanceTintControllerTest { 
                mDisplayWhiteBalanceTintController.getTransitionDurationMilliseconds(false));

    }





    private void setUpTransitionTimes() {

        doReturn(mResources.getStringArray(R.array.config_displayWhiteBalanceDisplayPrimaries))

                .when(mMockedResources)