From db46ba61fcf7a6d0b57e06e774dee6e484829249 Mon Sep 17 00:00:00 2001
From: Ady Abraham <adyabr@google.com>
Date: Mon, 8 Aug 2022 17:50:32 +0000
Subject: 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
---
 services/core/java/com/android/server/wm/WindowManagerService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 8f1702c1b0fa..78ed43658dd5 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 @@ 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) {
-- 
cgit v1.2.3-59-g8ed1b