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

Commit f5d30dae authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge changes I95b11be3,Id878e0b7 into main 

* changes:
  Remove adaptive tone improvements 2 flag
  Remove Adaptive tone improvements 1 Flag
parents 115f68b3 a092d820

services/core/java/com/android/server/display/DisplayPowerController.java

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        if (mScreenBrightnessRampAnimator == null) {

            return;

        }

        if (mFlags.isAdaptiveTone1Enabled() && isIdle) {

        if (isIdle) {

            mScreenBrightnessRampAnimator.setAnimationTimeLimits(

                    mBrightnessRampIncreaseMaxTimeIdleMillis,

                    mBrightnessRampDecreaseMaxTimeIdleMillis);

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 −24
Original line number Diff line number Diff line
@@ -41,14 +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 mAdaptiveToneImprovements1 = new FlagState(

            Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_1,

            Flags::enableAdaptiveToneImprovements1);



    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);
@@ -287,20 +279,6 @@ public class DisplayManagerFlags { 
        return mPowerThrottlingClamperFlagState.isEnabled();

    }



    /**

     * Returns whether adaptive tone improvements are enabled

     */

    public boolean isAdaptiveTone1Enabled() {

        return mAdaptiveToneImprovements1.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();
@@ -588,8 +566,6 @@ public class DisplayManagerFlags { 
    public void dump(PrintWriter pw) {

        pw.println("DisplayManagerFlags:");

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

        pw.println(" " + mAdaptiveToneImprovements1);

        pw.println(" " + mAdaptiveToneImprovements2);

        pw.println(" " + mBackUpSmoothDisplayAndForcePeakRefreshRateFlagState);

        pw.println(" " + mConnectedDisplayErrorHandlingFlagState);

        pw.println(" " + mDisplayOffloadFlagState);

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

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

}



flag {

    name: "enable_adaptive_tone_improvements_1"

    namespace: "display_manager"

    description: "Feature flag for Adaptive Tone Improvements"

    bug: "299550755"

    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/DisplayPowerControllerTest.java

+0 −62
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ import android.os.PowerManager; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.test.TestLooper;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.provider.Settings;
@@ -94,7 +92,6 @@ import com.android.server.display.color.ColorDisplayService; 
import com.android.server.display.config.HighBrightnessModeData;

import com.android.server.display.config.HysteresisLevels;

import com.android.server.display.feature.DisplayManagerFlags;

import com.android.server.display.feature.flags.Flags;

import com.android.server.display.layout.Layout;

import com.android.server.display.plugin.PluginManager;

import com.android.server.display.whitebalance.DisplayWhiteBalanceController;
@@ -1372,7 +1369,6 @@ public final class DisplayPowerControllerTest { 


    @Test

    public void testDwbcCallsHappenOnHandler() {

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

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);



        // Send a display power request
@@ -1498,35 +1494,7 @@ public final class DisplayPowerControllerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_1)

    public void testRampMaxTimeInteractiveThenIdle() {

        // Send a display power request

        DisplayPowerRequest dpr = new DisplayPowerRequest();

        dpr.policy = DisplayPowerRequest.POLICY_BRIGHT;

        dpr.useProximitySensor = true;

        mHolder.dpc.requestPowerState(dpr, false /* waitForNegativeProximity */);



        // Run updatePowerState

        advanceTime(1);



        setUpDisplay(DISPLAY_ID, "new_unique_id", mHolder.display, mock(DisplayDevice.class),

                mHolder.config, /* isEnabled= */ true);

        verify(mHolder.animator).setAnimationTimeLimits(BRIGHTNESS_RAMP_INCREASE_MAX,

                BRIGHTNESS_RAMP_DECREASE_MAX);



        // switch to idle mode

        mHolder.dpc.setAutomaticScreenBrightnessMode(AUTO_BRIGHTNESS_MODE_IDLE);

        advanceTime(1);



        // A second time, when switching to idle mode.

        verify(mHolder.animator, times(2)).setAnimationTimeLimits(BRIGHTNESS_RAMP_INCREASE_MAX,

                BRIGHTNESS_RAMP_DECREASE_MAX);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_1)

    public void testRampMaxTimeInteractiveThenIdle_DifferentValues() {

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

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID, /* isEnabled= */ true);



        // Send a display power request
@@ -1553,37 +1521,7 @@ public final class DisplayPowerControllerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_1)

    public void testRampMaxTimeIdle() {

        // Send a display power request

        DisplayPowerRequest dpr = new DisplayPowerRequest();

        dpr.policy = DisplayPowerRequest.POLICY_BRIGHT;

        dpr.useProximitySensor = true;

        mHolder.dpc.requestPowerState(dpr, false /* waitForNegativeProximity */);

        // Run updatePowerState

        advanceTime(1);

        // Once on setup

        verify(mHolder.animator).setAnimationTimeLimits(BRIGHTNESS_RAMP_INCREASE_MAX,

                BRIGHTNESS_RAMP_DECREASE_MAX);



        setUpDisplay(DISPLAY_ID, "new_unique_id", mHolder.display, mock(DisplayDevice.class),

                mHolder.config, /* isEnabled= */ true);



        // switch to idle mode

        mHolder.dpc.setAutomaticScreenBrightnessMode(AUTO_BRIGHTNESS_MODE_IDLE);



        // Process the MSG_SWITCH_AUTOBRIGHTNESS_MODE event

        advanceTime(1);



        // A second time when switching to idle mode.

        verify(mHolder.animator, times(2)).setAnimationTimeLimits(BRIGHTNESS_RAMP_INCREASE_MAX,

                BRIGHTNESS_RAMP_DECREASE_MAX);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_1)

    public void testRampMaxTimeIdle_DifferentValues() {

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

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID, /* isEnabled= */ true);



        // Send a display power request