From 50ed3bc8d39e8805020bbbceaa10d76917dace4a Mon Sep 17 00:00:00 2001 From: Evan Severson Date: Mon, 9 Aug 2021 08:51:58 -0700 Subject: Check targetsdk for filtering partial overlay touches Test: on S: atest CtsPermission3TestCases build on S, install on R, verify touches go through Bug: 191529039 Change-Id: Ic4dd16f7f679a345903ff5913d1c28b99fa6d0b0 --- .../permission/ui/widget/SecureButton.java | 10 ++++++++-- 1 file 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); } } -- cgit v1.2.3