diff options
| author | 2020-09-10 11:51:37 -0700 | |
|---|---|---|
| committer | 2020-09-10 11:51:37 -0700 | |
| commit | f59b105ae128e640720f6dc7f57e300acc827657 (patch) | |
| tree | 50b27979a13f4c8ed1c32335679c2c8e703e3f21 | |
| parent | 01d4ef821f642501c4fcdae443dce4fc465d8d8b (diff) | |
Avoid SettingNotFoundException
Fixes: 167648761
Test: atest FaceAuthScreenBrightnessControllerTest
Change-Id: I8aa1a9bf8610035fc4d23ed1f83d036d7d98799f
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt index 9dcc3bb6fbdc..a7d17e128ff3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt @@ -177,7 +177,7 @@ open class FaceAuthScreenBrightnessController( userDefinedBrightness = systemSettings.getFloat(SCREEN_BRIGHTNESS_FLOAT) } }) - userDefinedBrightness = systemSettings.getFloat(SCREEN_BRIGHTNESS_FLOAT) + userDefinedBrightness = systemSettings.getFloat(SCREEN_BRIGHTNESS_FLOAT, 1f) } override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt index 58cb0324c69a..73a7ca93507d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt @@ -87,6 +87,8 @@ class FaceAuthScreenBrightnessControllerTest : SysuiTestCase() { override fun createAnimator(start: Float, end: Float) = animator } `when`(systemSettings.getFloat(eq(SCREEN_BRIGHTNESS_FLOAT))).thenReturn(INITIAL_BRIGHTNESS) + `when`(systemSettings.getFloat(eq(SCREEN_BRIGHTNESS_FLOAT), eq(1f))) + .thenReturn(INITIAL_BRIGHTNESS) faceAuthScreenBrightnessController.attach(whiteOverlay) verify(keyguardUpdateMonitor).registerCallback(capture(keyguardUpdateCallback)) } |