summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ady Abraham <adyabr@google.com> 2022-08-08 17:50:32 +0000
committer Ady Abraham <adyabr@google.com> 2022-08-08 22:28:16 +0000
commitbda5ee8cf7d0977aa30972b9af7011086f1ed701 (patch)
treecda6b5ab98edbd44acdc7825b5c69d565234d5ac
parent06d1cb69ddeeaa3be86615d7f67f4f227d68872c (diff)
mMaximumObscuringOpacityForTouch should remain valid
set mMaximumObscuringOpacityForTouch to the defaul value in case that the system settings contains an invalid value. Change-Id: I4f15a7573913b503635995d26053bed9aa753a45 Test: presubmit Bug: 238983569
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 79037ab6a787..9c1cc4d5be16 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -899,6 +899,11 @@ public class WindowManagerService extends IWindowManager.Stub
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) {