Snap for 7633965 from c8f2a97319640e3dc0bb0103ec5a38fb4139c234 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-release

Change-Id: I9231f11d40a7a04850bd45ab7da5ea585d61ef56

1 files changed, 8 insertions, 2 deletions

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 20025d0ee..d5f6183bb 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.util.AttributeSet;
 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 @@ public class SecureButton extends Button {
 
     @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);
     }
 }