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

Merge "Stop the screen off brightness sensor controller" into tm-qpr-dev am: 3fce317e59

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20869684

Change-Id: I05a94975ffe023a02e55dc8be40ab7f388564944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-04 18:27:04 +00:00
committed by Automerger Merge Worker
parent 7347d3f150 3fce317e59
commit 52d2e66e1f
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -860,6 +860,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mAutomaticBrightnessController.stop(); mAutomaticBrightnessController.stop();
} }
if (mScreenOffBrightnessSensorController != null) {
mScreenOffBrightnessSensorController.stop();
}
if (mBrightnessSetting != null) { if (mBrightnessSetting != null) {
mBrightnessSetting.unregisterListener(mBrightnessSettingListener); mBrightnessSetting.unregisterListener(mBrightnessSettingListener);
} }
@@ -1104,6 +1108,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mBrightnessEventRingBuffer = mBrightnessEventRingBuffer =
new RingBuffer<>(BrightnessEvent.class, RINGBUFFER_MAX); new RingBuffer<>(BrightnessEvent.class, RINGBUFFER_MAX);
if (mScreenOffBrightnessSensorController != null) {
mScreenOffBrightnessSensorController.stop();
}
loadScreenOffBrightnessSensor(); loadScreenOffBrightnessSensor();
int[] sensorValueToLux = mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux(); int[] sensorValueToLux = mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux();
if (mScreenOffBrightnessSensor != null && sensorValueToLux != null) { if (mScreenOffBrightnessSensor != null && sensorValueToLux != null) {

4
services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java
View File

@@ -92,6 +92,10 @@ public class ScreenOffBrightnessSensorController implements SensorEventListener
} }
} }
void stop() {
setLightSensorEnabled(false);
}
float getAutomaticScreenBrightness() { float getAutomaticScreenBrightness() {
if (mLastSensorValue < 0 || mLastSensorValue >= mSensorValueToLux.length if (mLastSensorValue < 0 || mLastSensorValue >= mSensorValueToLux.length
|| (!mRegistered || (!mRegistered

10
services/tests/servicestests/src/com/android/server/display/ScreenOffBrightnessSensorControllerTest.java
View File

@@ -35,6 +35,7 @@ import androidx.test.runner.AndroidJUnit4;
import com.android.server.testutils.OffsettableClock; import com.android.server.testutils.OffsettableClock;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -73,6 +74,15 @@ public class ScreenOffBrightnessSensorControllerTest {
); );
} }
@After
public void tearDown() {
if (mController != null) {
// Stop the update Brightness loop.
mController.stop();
mController = null;
}
}
@Test @Test
public void testBrightness() throws Exception { public void testBrightness() throws Exception {
when(mSensorManager.registerListener(any(SensorEventListener.class), eq(mLightSensor), when(mSensorManager.registerListener(any(SensorEventListener.class), eq(mLightSensor),