Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Populate BrightnessEvent from AutoBrightnessStrat." into udc-dev

Browse Source
This commit is contained in:
Santos Cordon
2023-04-27 13:04:31 +00:00
committed by Android (Google) Code Review
parent 2cc234650b 8b3f546bcb
commit fba8087e3f
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/display/AutomaticBrightnessController.java
View File

@@ -366,7 +366,12 @@ public class AutomaticBrightnessController {
return getAutomaticScreenBrightness(null); return getAutomaticScreenBrightness(null);
} }
float getAutomaticScreenBrightness(BrightnessEvent brightnessEvent) { /**
* @return The current brightness recommendation calculated from the current conditions.
* @param brightnessEvent Event object to populate with details about why the specific
* brightness was chosen.
*/
public float getAutomaticScreenBrightness(BrightnessEvent brightnessEvent) {
if (brightnessEvent != null) { if (brightnessEvent != null) {
brightnessEvent.setLux( brightnessEvent.setLux(
mAmbientLuxValid ? mAmbientLux : PowerManager.BRIGHTNESS_INVALID_FLOAT); mAmbientLuxValid ? mAmbientLux : PowerManager.BRIGHTNESS_INVALID_FLOAT);

3
services/core/java/com/android/server/display/DisplayPowerController2.java
View File

@@ -1302,7 +1302,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
int brightnessAdjustmentFlags = 0; int brightnessAdjustmentFlags = 0;
if (Float.isNaN(brightnessState)) { if (Float.isNaN(brightnessState)) {
if (mAutomaticBrightnessStrategy.isAutoBrightnessEnabled()) { if (mAutomaticBrightnessStrategy.isAutoBrightnessEnabled()) {
brightnessState = mAutomaticBrightnessStrategy.getAutomaticScreenBrightness(); brightnessState = mAutomaticBrightnessStrategy.getAutomaticScreenBrightness(
mTempBrightnessEvent);
if (BrightnessUtils.isValidBrightnessValue(brightnessState) if (BrightnessUtils.isValidBrightnessValue(brightnessState)
|| brightnessState == PowerManager.BRIGHTNESS_OFF_FLOAT) { || brightnessState == PowerManager.BRIGHTNESS_OFF_FLOAT) {
rawBrightnessState = mAutomaticBrightnessController rawBrightnessState = mAutomaticBrightnessController

7
services/core/java/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategy.java
View File

@@ -25,6 +25,7 @@ import android.view.Display;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.server.display.AutomaticBrightnessController; import com.android.server.display.AutomaticBrightnessController;
import com.android.server.display.brightness.BrightnessEvent;
import com.android.server.display.brightness.BrightnessReason; import com.android.server.display.brightness.BrightnessReason;
import com.android.server.display.brightness.BrightnessUtils; import com.android.server.display.brightness.BrightnessUtils;
@@ -252,10 +253,12 @@ public class AutomaticBrightnessStrategy {
/** /**
* Evaluates the target automatic brightness of the associated display. * Evaluates the target automatic brightness of the associated display.
* @param brightnessEvent Event object to populate with details about why the specific
* brightness was chosen.
*/ */
public float getAutomaticScreenBrightness() { public float getAutomaticScreenBrightness(BrightnessEvent brightnessEvent) {
float brightness = (mAutomaticBrightnessController != null) float brightness = (mAutomaticBrightnessController != null)
? mAutomaticBrightnessController.getAutomaticScreenBrightness() ? mAutomaticBrightnessController.getAutomaticScreenBrightness(brightnessEvent)
: PowerManager.BRIGHTNESS_INVALID_FLOAT; : PowerManager.BRIGHTNESS_INVALID_FLOAT;
adjustAutomaticBrightnessStateIfValid(brightness); adjustAutomaticBrightnessStateIfValid(brightness);
return brightness; return brightness;

9
services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java
View File

@@ -64,6 +64,7 @@ import com.android.server.ExtendedMockitoRule;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.am.BatteryStatsService; import com.android.server.am.BatteryStatsService;
import com.android.server.display.RampAnimator.DualRampAnimator; import com.android.server.display.RampAnimator.DualRampAnimator;
import com.android.server.display.brightness.BrightnessEvent;
import com.android.server.display.color.ColorDisplayService; import com.android.server.display.color.ColorDisplayService;
import com.android.server.display.layout.Layout; import com.android.server.display.layout.Layout;
import com.android.server.display.whitebalance.DisplayWhiteBalanceController; import com.android.server.display.whitebalance.DisplayWhiteBalanceController;
@@ -632,8 +633,8 @@ public final class DisplayPowerController2Test {
.thenReturn(brightness); .thenReturn(brightness);
dpr.policy = DisplayPowerRequest.POLICY_BRIGHT; dpr.policy = DisplayPowerRequest.POLICY_BRIGHT;
when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_ON); when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_ON);
when(mHolder.automaticBrightnessController.getAutomaticScreenBrightness()) when(mHolder.automaticBrightnessController.getAutomaticScreenBrightness(
.thenReturn(PowerManager.BRIGHTNESS_INVALID_FLOAT); any(BrightnessEvent.class))).thenReturn(PowerManager.BRIGHTNESS_INVALID_FLOAT);
mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false); mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false);
advanceTime(1); // Run updatePowerState advanceTime(1); // Run updatePowerState
@@ -667,8 +668,8 @@ public final class DisplayPowerController2Test {
.thenReturn(brightness); .thenReturn(brightness);
dpr.policy = DisplayPowerRequest.POLICY_BRIGHT; dpr.policy = DisplayPowerRequest.POLICY_BRIGHT;
when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_ON); when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_ON);
when(mHolder.automaticBrightnessController.getAutomaticScreenBrightness()) when(mHolder.automaticBrightnessController.getAutomaticScreenBrightness(
.thenReturn(PowerManager.BRIGHTNESS_INVALID_FLOAT); any(BrightnessEvent.class))).thenReturn(PowerManager.BRIGHTNESS_INVALID_FLOAT);
mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false); mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false);
advanceTime(1); // Run updatePowerState advanceTime(1); // Run updatePowerState

9
services/tests/servicestests/src/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategyTest.java
View File

@@ -18,6 +18,7 @@ package com.android.server.display.brightness.strategy;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -40,6 +41,7 @@ import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.test.FakeSettingsProvider; import com.android.internal.util.test.FakeSettingsProvider;
import com.android.internal.util.test.FakeSettingsProviderRule; import com.android.internal.util.test.FakeSettingsProviderRule;
import com.android.server.display.AutomaticBrightnessController; import com.android.server.display.AutomaticBrightnessController;
import com.android.server.display.brightness.BrightnessEvent;
import com.android.server.display.brightness.BrightnessReason; import com.android.server.display.brightness.BrightnessReason;
import org.junit.After; import org.junit.After;
@@ -262,12 +264,13 @@ public class AutomaticBrightnessStrategyTest {
float automaticScreenBrightness = 0.3f; float automaticScreenBrightness = 0.3f;
AutomaticBrightnessController automaticBrightnessController = mock( AutomaticBrightnessController automaticBrightnessController = mock(
AutomaticBrightnessController.class); AutomaticBrightnessController.class);
when(automaticBrightnessController.getAutomaticScreenBrightness()).thenReturn( when(automaticBrightnessController.getAutomaticScreenBrightness(any(BrightnessEvent.class)))
automaticScreenBrightness); .thenReturn(automaticScreenBrightness);
mAutomaticBrightnessStrategy.setAutomaticBrightnessController( mAutomaticBrightnessStrategy.setAutomaticBrightnessController(
automaticBrightnessController); automaticBrightnessController);
assertEquals(automaticScreenBrightness, assertEquals(automaticScreenBrightness,
mAutomaticBrightnessStrategy.getAutomaticScreenBrightness(), 0.0f); mAutomaticBrightnessStrategy.getAutomaticScreenBrightness(
new BrightnessEvent(DISPLAY_ID)), 0.0f);
} }
@Test @Test