mMaximumObscuringOpacityForTouch should remain valid set mMaximumObscuringOpacityForTouch to the defaul value in case that the system settings contains an invalid value. Merged-In: I4f15a7573913b503635995d26053bed9aa753a45 Change-Id: I4f15a7573913b503635995d26053bed9aa753a45 Test: presubmit Bug: 274213741
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 8f1702c..78ed436 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -913,6 +913,11 @@ mMaximumObscuringOpacityForTouch = Settings.Global.getFloat(resolver, Settings.Global.MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH, InputManager.DEFAULT_MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH); + if (mMaximumObscuringOpacityForTouch < 0.0f + || mMaximumObscuringOpacityForTouch > 1.0f) { + mMaximumObscuringOpacityForTouch = + InputManager.DEFAULT_MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH; + } } void updateSystemUiSettings(boolean handleChange) {