commit c11239c07afab2d6093c8efb3fa59328b7389df7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Aug 12 01:09:10 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Aug 12 01:09:10 2021 +0000
tree 179c6ffba352daa3a0aeee0c09b0de410cda8d9a
parent 292f49334082881e53c592b96e4892643bdce098
parent c8f2a97319640e3dc0bb0103ec5a38fb4139c234

Snap for 7633965 from c8f2a97319640e3dc0bb0103ec5a38fb4139c234 to sc-release

Change-Id: I9231f11d40a7a04850bd45ab7da5ea585d61ef56

PermissionController/src/com/android/permissioncontroller/permission/ui/widget/SecureButton.java

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/widget/SecureButton.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/widget/SecureButton.java
index 20025d0..d5f6183 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/widget/SecureButton.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/widget/SecureButton.java
@@ -21,6 +21,8 @@
 import android.view.MotionEvent;
 import android.widget.Button;
 
+import com.android.modules.utils.build.SdkLevel;
+
 /**
  * A button which doesn't allow clicking when any part of the window is obscured
  */
@@ -47,7 +49,11 @@
 
     @Override
     public boolean onFilterTouchEventForSecurity(MotionEvent event) {
-        return (event.getFlags() & FLAGS_WINDOW_IS_OBSCURED) == 0
-                && super.onFilterTouchEventForSecurity(event);
+        if (SdkLevel.isAtLeastS()) {
+            return (event.getFlags() & FLAGS_WINDOW_IS_OBSCURED) == 0
+                    && super.onFilterTouchEventForSecurity(event);
+        }
+
+        return super.onFilterTouchEventForSecurity(event);
     }
 }