diff options
18 files changed, 89 insertions, 24 deletions
diff --git a/services/core/java/com/android/server/display/DisplayBrightnessState.java b/services/core/java/com/android/server/display/DisplayBrightnessState.java index baa154d6d7b9..184ae41fe045 100644 --- a/services/core/java/com/android/server/display/DisplayBrightnessState.java +++ b/services/core/java/com/android/server/display/DisplayBrightnessState.java @@ -47,6 +47,8 @@ public final class DisplayBrightnessState { private final BrightnessEvent mBrightnessEvent; private final int mBrightnessAdjustmentFlag; + private final boolean mIsUserInitiatedChange; + private DisplayBrightnessState(Builder builder) { mBrightness = builder.getBrightness(); mSdrBrightness = builder.getSdrBrightness(); @@ -60,6 +62,7 @@ public final class DisplayBrightnessState { mShouldUpdateScreenBrightnessSetting = builder.shouldUpdateScreenBrightnessSetting(); mBrightnessEvent = builder.getBrightnessEvent(); mBrightnessAdjustmentFlag = builder.getBrightnessAdjustmentFlag(); + mIsUserInitiatedChange = builder.isUserInitiatedChange(); } /** @@ -148,6 +151,13 @@ public final class DisplayBrightnessState { return mBrightnessAdjustmentFlag; } + /** + * Gets if the current brightness changes are because of a user initiated change + */ + public boolean isUserInitiatedChange() { + return mIsUserInitiatedChange; + } + @Override public String toString() { StringBuilder stringBuilder = new StringBuilder("DisplayBrightnessState:"); @@ -168,6 +178,7 @@ public final class DisplayBrightnessState { stringBuilder.append("\n mBrightnessEvent:") .append(Objects.toString(mBrightnessEvent, "null")); stringBuilder.append("\n mBrightnessAdjustmentFlag:").append(mBrightnessAdjustmentFlag); + stringBuilder.append("\n mIsUserInitiatedChange:").append(mIsUserInitiatedChange); return stringBuilder.toString(); } @@ -199,7 +210,8 @@ public final class DisplayBrightnessState { && mShouldUpdateScreenBrightnessSetting == otherState.shouldUpdateScreenBrightnessSetting() && Objects.equals(mBrightnessEvent, otherState.getBrightnessEvent()) - && mBrightnessAdjustmentFlag == otherState.getBrightnessAdjustmentFlag(); + && mBrightnessAdjustmentFlag == otherState.getBrightnessAdjustmentFlag() + && mIsUserInitiatedChange == otherState.isUserInitiatedChange(); } @Override @@ -207,7 +219,8 @@ public final class DisplayBrightnessState { return Objects.hash(mBrightness, mSdrBrightness, mBrightnessReason, mShouldUseAutoBrightness, mIsSlowChange, mMaxBrightness, mMinBrightness, mCustomAnimationRate, - mShouldUpdateScreenBrightnessSetting, mBrightnessEvent, mBrightnessAdjustmentFlag); + mShouldUpdateScreenBrightnessSetting, mBrightnessEvent, mBrightnessAdjustmentFlag, + mIsUserInitiatedChange); } /** @@ -236,6 +249,8 @@ public final class DisplayBrightnessState { public int mBrightnessAdjustmentFlag = 0; + private boolean mIsUserInitiatedChange; + /** * Create a builder starting with the values from the specified {@link * DisplayBrightnessState}. @@ -257,6 +272,7 @@ public final class DisplayBrightnessState { state.shouldUpdateScreenBrightnessSetting()); builder.setBrightnessEvent(state.getBrightnessEvent()); builder.setBrightnessAdjustmentFlag(state.getBrightnessAdjustmentFlag()); + builder.setIsUserInitiatedChange(state.isUserInitiatedChange()); return builder; } @@ -464,5 +480,20 @@ public final class DisplayBrightnessState { mBrightnessAdjustmentFlag = brightnessAdjustmentFlag; return this; } + + /** + * Gets if the current change is a user initiated change + */ + public boolean isUserInitiatedChange() { + return mIsUserInitiatedChange; + } + + /** + * This is used to set if the current change is a user initiated change + */ + public Builder setIsUserInitiatedChange(boolean isUserInitiatedChange) { + mIsUserInitiatedChange = isUserInitiatedChange; + return this; + } } } diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index b97053b21b8e..8d71c701cf87 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -1391,6 +1391,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // request changes. final boolean wasShortTermModelActive = mAutomaticBrightnessStrategy.isShortTermModelActive(); + boolean userInitiatedChange = displayBrightnessState.isUserInitiatedChange(); boolean allowAutoBrightnessWhileDozing = mDisplayBrightnessController.isAllowAutoBrightnessWhileDozingConfig(); if (mFlags.offloadControlsDozeAutoBrightness() && mFlags.isDisplayOffloadEnabled() @@ -1413,13 +1414,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mPowerRequest.policy, mDisplayBrightnessController.getLastUserSetScreenBrightness(), userSetBrightnessChanged); + + // If the brightness is already set then it's been overridden by something other than + // the user, or is a temporary adjustment. + userInitiatedChange = (Float.isNaN(brightnessState)) + && (mAutomaticBrightnessStrategy.getAutoBrightnessAdjustmentChanged() + || userSetBrightnessChanged); } - // If the brightness is already set then it's been overridden by something other than the - // user, or is a temporary adjustment. - boolean userInitiatedChange = (Float.isNaN(brightnessState)) - && (mAutomaticBrightnessStrategy.getAutoBrightnessAdjustmentChanged() - || userSetBrightnessChanged); final int autoBrightnessState = mAutomaticBrightnessStrategy.isAutoBrightnessEnabled() ? AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED diff --git a/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java b/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java index aa17df6562d8..d567331a59ce 100644 --- a/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java +++ b/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java @@ -600,6 +600,7 @@ public final class DisplayBrightnessController { private StrategyExecutionRequest constructStrategyExecutionRequest( DisplayManagerInternal.DisplayPowerRequest displayPowerRequest) { float currentScreenBrightness = getCurrentBrightness(); - return new StrategyExecutionRequest(displayPowerRequest, currentScreenBrightness); + return new StrategyExecutionRequest(displayPowerRequest, currentScreenBrightness, + mUserSetScreenBrightnessUpdated); } } diff --git a/services/core/java/com/android/server/display/brightness/StrategyExecutionRequest.java b/services/core/java/com/android/server/display/brightness/StrategyExecutionRequest.java index 82c0bbfde47e..304640b884ef 100644 --- a/services/core/java/com/android/server/display/brightness/StrategyExecutionRequest.java +++ b/services/core/java/com/android/server/display/brightness/StrategyExecutionRequest.java @@ -29,10 +29,14 @@ public final class StrategyExecutionRequest { private final float mCurrentScreenBrightness; + // Represents if the user set screen brightness was changed or not. + private boolean mUserSetBrightnessChanged; + public StrategyExecutionRequest(DisplayManagerInternal.DisplayPowerRequest displayPowerRequest, - float currentScreenBrightness) { + float currentScreenBrightness, boolean userSetBrightnessChanged) { mDisplayPowerRequest = displayPowerRequest; mCurrentScreenBrightness = currentScreenBrightness; + mUserSetBrightnessChanged = userSetBrightnessChanged; } public DisplayManagerInternal.DisplayPowerRequest getDisplayPowerRequest() { @@ -43,6 +47,10 @@ public final class StrategyExecutionRequest { return mCurrentScreenBrightness; } + public boolean isUserSetBrightnessChanged() { + return mUserSetBrightnessChanged; + } + @Override public boolean equals(Object obj) { if (!(obj instanceof StrategyExecutionRequest)) { @@ -50,11 +58,13 @@ public final class StrategyExecutionRequest { } StrategyExecutionRequest other = (StrategyExecutionRequest) obj; return Objects.equals(mDisplayPowerRequest, other.getDisplayPowerRequest()) - && mCurrentScreenBrightness == other.getCurrentScreenBrightness(); + && mCurrentScreenBrightness == other.getCurrentScreenBrightness() + && mUserSetBrightnessChanged == other.isUserSetBrightnessChanged(); } @Override public int hashCode() { - return Objects.hash(mDisplayPowerRequest, mCurrentScreenBrightness); + return Objects.hash(mDisplayPowerRequest, mCurrentScreenBrightness, + mUserSetBrightnessChanged); } } diff --git a/services/core/java/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategy.java b/services/core/java/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategy.java index 29073644ee2e..2b5241fd5baf 100644 --- a/services/core/java/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategy.java +++ b/services/core/java/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategy.java @@ -290,6 +290,8 @@ public class AutomaticBrightnessStrategy extends AutomaticBrightnessStrategy2 .setBrightnessAdjustmentFlag(mAutoBrightnessAdjustmentReasonsFlags) .setShouldUpdateScreenBrightnessSetting( brightness != strategyExecutionRequest.getCurrentScreenBrightness()) + .setIsUserInitiatedChange(getAutoBrightnessAdjustmentChanged() + || strategyExecutionRequest.isUserSetBrightnessChanged()) .build(); } diff --git a/services/core/java/com/android/server/display/brightness/strategy/FallbackBrightnessStrategy.java b/services/core/java/com/android/server/display/brightness/strategy/FallbackBrightnessStrategy.java index 3463649aa000..0b92317a61cb 100644 --- a/services/core/java/com/android/server/display/brightness/strategy/FallbackBrightnessStrategy.java +++ b/services/core/java/com/android/server/display/brightness/strategy/FallbackBrightnessStrategy.java @@ -45,6 +45,7 @@ public class FallbackBrightnessStrategy implements DisplayBrightnessStrategy{ // The fallback brightness might change due to clamping. Make sure we tell the rest // of the system by updating the setting .setShouldUpdateScreenBrightnessSetting(true) + .setIsUserInitiatedChange(strategyExecutionRequest.isUserSetBrightnessChanged()) .build(); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java index 8db896b76f6c..bba4c8d64c86 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java @@ -58,6 +58,7 @@ public class DisplayBrightnessStateTest { .setShouldUseAutoBrightness(shouldUseAutoBrightness) .setShouldUpdateScreenBrightnessSetting(shouldUpdateScreenBrightnessSetting) .setBrightnessAdjustmentFlag(brightnessAdjustmentFlag) + .setIsUserInitiatedChange(true) .build(); assertEquals(displayBrightnessState.getBrightness(), brightness, FLOAT_DELTA); @@ -109,7 +110,9 @@ public class DisplayBrightnessStateTest { .append("\n mBrightnessEvent:") .append(Objects.toString(displayBrightnessState.getBrightnessEvent(), "null")) .append("\n mBrightnessAdjustmentFlag:") - .append(displayBrightnessState.getBrightnessAdjustmentFlag()); + .append(displayBrightnessState.getBrightnessAdjustmentFlag()) + .append("\n mIsUserInitiatedChange:") + .append(displayBrightnessState.isUserInitiatedChange()); return sb.toString(); } } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java index c5105e78d0b3..323ef6a28e14 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java @@ -121,7 +121,8 @@ public final class DisplayBrightnessControllerTest { any(StrategySelectionRequest.class))).thenReturn(displayBrightnessStrategy); mDisplayBrightnessController.updateBrightness(displayPowerRequest, targetDisplayState); verify(displayBrightnessStrategy).updateBrightness( - eq(new StrategyExecutionRequest(displayPowerRequest, DEFAULT_BRIGHTNESS))); + eq(new StrategyExecutionRequest(displayPowerRequest, DEFAULT_BRIGHTNESS, + /* userSetBrightnessChanged= */ false))); assertEquals(mDisplayBrightnessController.getCurrentDisplayBrightnessStrategy(), displayBrightnessStrategy); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategyTest.java index 7a6a91108282..4d5ff55cc805 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategyTest.java @@ -115,7 +115,8 @@ public class AutoBrightnessFallbackStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mAutoBrightnessFallbackStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategyTest.java index afb5a5cc5cc4..8a33f341df56 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategyTest.java @@ -513,9 +513,11 @@ public class AutomaticBrightnessStrategyTest { .setBrightnessEvent(brightnessEvent) .setBrightnessAdjustmentFlag(BrightnessReason.ADJUSTMENT_AUTO) .setShouldUpdateScreenBrightnessSetting(true) + .setIsUserInitiatedChange(true) .build(); DisplayBrightnessState actualDisplayBrightnessState = mAutomaticBrightnessStrategy - .updateBrightness(new StrategyExecutionRequest(displayPowerRequest, 0.6f)); + .updateBrightness(new StrategyExecutionRequest(displayPowerRequest, 0.6f, + /* userSetBrightnessChanged= */ true)); assertEquals(expectedDisplayBrightnessState, actualDisplayBrightnessState); } @@ -560,9 +562,11 @@ public class AutomaticBrightnessStrategyTest { .setBrightnessEvent(brightnessEvent) .setBrightnessAdjustmentFlag(BrightnessReason.ADJUSTMENT_AUTO_TEMP) .setShouldUpdateScreenBrightnessSetting(true) + .setIsUserInitiatedChange(true) .build(); DisplayBrightnessState actualDisplayBrightnessState = mAutomaticBrightnessStrategy - .updateBrightness(new StrategyExecutionRequest(displayPowerRequest, 0.6f)); + .updateBrightness(new StrategyExecutionRequest(displayPowerRequest, 0.6f, + /* userSetBrightnessChanged= */ true)); assertEquals(expectedDisplayBrightnessState, actualDisplayBrightnessState); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/BoostBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/BoostBrightnessStrategyTest.java index 47f174684771..353432539587 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/BoostBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/BoostBrightnessStrategyTest.java @@ -60,7 +60,8 @@ public class BoostBrightnessStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mBoostBrightnessStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/DozeBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/DozeBrightnessStrategyTest.java index 9246780a8516..bd6d8be45fcb 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/DozeBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/DozeBrightnessStrategyTest.java @@ -57,7 +57,8 @@ public class DozeBrightnessStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mDozeBrightnessModeStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); } } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FallbackBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FallbackBrightnessStrategyTest.java index c4767ae5172b..4cae35d11853 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FallbackBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FallbackBrightnessStrategyTest.java @@ -57,10 +57,12 @@ public class FallbackBrightnessStrategyTest { .setSdrBrightness(currentBrightness) .setDisplayBrightnessStrategyName(mFallbackBrightnessStrategy.getName()) .setShouldUpdateScreenBrightnessSetting(true) + .setIsUserInitiatedChange(true) .build(); DisplayBrightnessState updatedDisplayBrightnessState = mFallbackBrightnessStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, currentBrightness)); + new StrategyExecutionRequest(displayPowerRequest, currentBrightness, + /* userSetBrightnessChanged= */ true)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); } } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FollowerBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FollowerBrightnessStrategyTest.java index 682c9cc980d2..fdaf8f6a7808 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FollowerBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/FollowerBrightnessStrategyTest.java @@ -61,7 +61,8 @@ public class FollowerBrightnessStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mFollowerBrightnessStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(expectedDisplayBrightnessState, updatedDisplayBrightnessState); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OffloadBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OffloadBrightnessStrategyTest.java index ccf630948aac..e3c276025e51 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OffloadBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OffloadBrightnessStrategyTest.java @@ -72,7 +72,8 @@ public class OffloadBrightnessStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mOffloadBrightnessStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); assertEquals(PowerManager.BRIGHTNESS_INVALID_FLOAT, mOffloadBrightnessStrategy .getOffloadScreenBrightness(), 0.0f); diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OverrideBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OverrideBrightnessStrategyTest.java index 8e7b4636a392..ebe407b2445b 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OverrideBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/OverrideBrightnessStrategyTest.java @@ -60,7 +60,8 @@ public class OverrideBrightnessStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mOverrideBrightnessStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/ScreenOffBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/ScreenOffBrightnessStrategyTest.java index e799d0e31165..4bad5696861f 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/ScreenOffBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/ScreenOffBrightnessStrategyTest.java @@ -58,7 +58,8 @@ public final class ScreenOffBrightnessStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mScreenOffBrightnessModeStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); } } diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/TemporaryBrightnessStrategyTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/TemporaryBrightnessStrategyTest.java index aaada4115a56..5410a20e9d75 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/TemporaryBrightnessStrategyTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/strategy/TemporaryBrightnessStrategyTest.java @@ -60,7 +60,8 @@ public class TemporaryBrightnessStrategyTest { .build(); DisplayBrightnessState updatedDisplayBrightnessState = mTemporaryBrightnessStrategy.updateBrightness( - new StrategyExecutionRequest(displayPowerRequest, 0.2f)); + new StrategyExecutionRequest(displayPowerRequest, 0.2f, + /* userSetBrightnessChanged= */ false)); assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState); } |