From bfa7982cf39801c42a87446ea82f1fc0119f3916 Mon Sep 17 00:00:00 2001 From: sallyyuen Date: Fri, 1 Jul 2022 09:01:53 -0700 Subject: [PATCH] Remove references to deprecated web enhancement APIs Test: builds and run CTS suite Bug: 237705788 Change-Id: I0dba15bb82af12e1ad9cc44dd07017148231ad9e --- .../android/accessibilityservice/AccessibilityServiceInfo.java | 3 --- core/java/android/app/UiAutomationConnection.java | 1 - 2 files changed, 4 deletions(-) diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 530de0f3af6b0..2e89ce83cd36a 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -79,7 +79,6 @@ import java.util.List; * @attr ref android.R.styleable#AccessibilityService_accessibilityEventTypes * @attr ref android.R.styleable#AccessibilityService_accessibilityFeedbackType * @attr ref android.R.styleable#AccessibilityService_accessibilityFlags - * @attr ref android.R.styleable#AccessibilityService_canRequestEnhancedWebAccessibility * @attr ref android.R.styleable#AccessibilityService_canRequestFilterKeyEvents * @attr ref android.R.styleable#AccessibilityService_canRequestTouchExplorationMode * @attr ref android.R.styleable#AccessibilityService_canRetrieveWindowContent @@ -1424,8 +1423,6 @@ public class AccessibilityServiceInfo implements Parcelable { return "CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT"; case CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION: return "CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION"; - case CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY: - return "CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY"; case CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS: return "CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS"; case CAPABILITY_CAN_CONTROL_MAGNIFICATION: diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java index 7964ae904392b..a045157e02db6 100644 --- a/core/java/android/app/UiAutomationConnection.java +++ b/core/java/android/app/UiAutomationConnection.java @@ -549,7 +549,6 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { | AccessibilityServiceInfo.FLAG_FORCE_DIRECT_BOOT_AWARE; info.setCapabilities(AccessibilityServiceInfo.CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION - | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS); try { // Calling out with a lock held is fine since if the system