From 8bc474b8dfbe2a6438853dd24cf7ee266bb1bf04 Mon Sep 17 00:00:00 2001 From: sallyyuen Date: Thu, 23 Apr 2020 09:33:56 -0700 Subject: [PATCH] Add @TestApi to registerSystemAction and unregisterSystemAction @SystemApi requires @hide, so @TestApi is needed for these to be visible to CTS testing Test: methods visible to CTS test Bug: 152052560 Change-Id: Icd7f82f3859a1deccd41d2279d8f9722a42df957 --- api/test-current.txt | 2 ++ core/java/android/view/accessibility/AccessibilityManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 755380e93b2ae..ff93f1fcacf72 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -4969,7 +4969,9 @@ package android.view.accessibility { method public void addAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener, @Nullable android.os.Handler); method @NonNull @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public java.util.List getAccessibilityShortcutTargets(int); method @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public void performAccessibilityShortcut(); + method @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public void registerSystemAction(@NonNull android.app.RemoteAction, int); method public void removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener); + method @RequiresPermission("android.permission.MANAGE_ACCESSIBILITY") public void unregisterSystemAction(int); } public static interface AccessibilityManager.AccessibilityServicesStateChangeListener { diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index 6a109253a27c8..46e3ffdf1634b 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -1288,6 +1288,7 @@ public final class AccessibilityManager { * @hide */ @SystemApi + @TestApi @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY) public void registerSystemAction(@NonNull RemoteAction action, int actionId) { final IAccessibilityManager service; @@ -1315,6 +1316,7 @@ public final class AccessibilityManager { * @hide */ @SystemApi + @TestApi @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY) public void unregisterSystemAction(int actionId) { final IAccessibilityManager service;