From ccaee6cdf0932c4a5ce32acb684220750a28043d Mon Sep 17 00:00:00 2001 From: Shailen Tuli Date: Mon, 6 Feb 2023 19:21:30 +0000 Subject: [PATCH] Ensured TYPE_VIEW_TARGETED_BY_SCROLL conforms to accessibility security policy. Test: see AccessibilitySecurityPolicyTest.java and cts/AccessibilityEventTest.java Bug: 268069422 Change-Id: Idb52fb0a3cb70b9d4ccda7f1ed0118298e274c87 --- .../server/accessibility/AccessibilitySecurityPolicy.java | 3 ++- .../server/accessibility/AccessibilitySecurityPolicyTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java index ce269f5eca592..48060017e6d2c 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java @@ -78,7 +78,8 @@ public class AccessibilitySecurityPolicy { | AccessibilityEvent.TYPE_VIEW_SCROLLED | AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED | AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED - | AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY; + | AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY + | AccessibilityEvent.TYPE_VIEW_TARGETED_BY_SCROLL; /** * Methods that should find their way into separate modules, but are still in AMS diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java index df21ea34c758a..eb6670ee964c7 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java @@ -113,6 +113,7 @@ public class AccessibilitySecurityPolicyTest { AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED, AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY, AccessibilityEvent.TYPE_VIEW_CONTEXT_CLICKED, + AccessibilityEvent.TYPE_VIEW_TARGETED_BY_SCROLL, }; private AccessibilitySecurityPolicy mA11ySecurityPolicy;