From f59b105ae128e640720f6dc7f57e300acc827657 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 10 Sep 2020 11:51:37 -0700 Subject: [PATCH] Avoid SettingNotFoundException Fixes: 167648761 Test: atest FaceAuthScreenBrightnessControllerTest Change-Id: I8aa1a9bf8610035fc4d23ed1f83d036d7d98799f --- .../systemui/keyguard/FaceAuthScreenBrightnessController.kt | 2 +- .../systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt index 9dcc3bb6fbdc2..a7d17e128ff32 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) { 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 58cb0324c69a8..73a7ca93507d2 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)) }