Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1786162a authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "Add @TestApi to registerSystemAction and unregisterSystemAction" into... 

Merge "Add @TestApi to registerSystemAction and unregisterSystemAction" into rvc-dev am: 8ab42a27 am: e5c438c6 am: 6f1b10b8

Change-Id: I3f198ad95b5e6eb69549ed5d8c6f84b383fd6288
parents de3f4d74 6f1b10b8

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -4976,7 +4976,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<java.lang.String> 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 {

core/java/android/view/accessibility/AccessibilityManager.java

+2 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,7 @@ public final class AccessibilityManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY)

    public void registerSystemAction(@NonNull RemoteAction action, int actionId) {

        final IAccessibilityManager service;
@@ -1306,6 +1307,7 @@ public final class AccessibilityManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY)

    public void unregisterSystemAction(int actionId) {

        final IAccessibilityManager service;