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

Commit 0744546e authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Mark APIs as 'final' as requested by Metalava." into main

parents c8b0817d 4ba1d16f

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -3344,9 +3344,9 @@ package android.accessibilityservice { 
  public abstract class AccessibilityService extends android.app.Service {

    ctor public AccessibilityService();

    method public void attachAccessibilityOverlayToDisplay(int, @NonNull android.view.SurfaceControl);

    method @FlaggedApi("android.view.accessibility.a11y_overlay_callbacks") public void attachAccessibilityOverlayToDisplay(int, @NonNull android.view.SurfaceControl, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);

    method @FlaggedApi("android.view.accessibility.a11y_overlay_callbacks") public final void attachAccessibilityOverlayToDisplay(int, @NonNull android.view.SurfaceControl, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);

    method public void attachAccessibilityOverlayToWindow(int, @NonNull android.view.SurfaceControl);

    method @FlaggedApi("android.view.accessibility.a11y_overlay_callbacks") public void attachAccessibilityOverlayToWindow(int, @NonNull android.view.SurfaceControl, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);

    method @FlaggedApi("android.view.accessibility.a11y_overlay_callbacks") public final void attachAccessibilityOverlayToWindow(int, @NonNull android.view.SurfaceControl, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);

    method public boolean clearCache();

    method public boolean clearCachedSubtree(@NonNull android.view.accessibility.AccessibilityNodeInfo);

    method public final void disableSelf();
@@ -3354,7 +3354,7 @@ package android.accessibilityservice { 
    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

    method @NonNull public final android.accessibilityservice.AccessibilityButtonController getAccessibilityButtonController();

    method @NonNull public final android.accessibilityservice.AccessibilityButtonController getAccessibilityButtonController(int);

    method @FlaggedApi("android.view.accessibility.braille_display_hid") @NonNull public android.accessibilityservice.BrailleDisplayController getBrailleDisplayController();

    method @FlaggedApi("android.view.accessibility.braille_display_hid") @NonNull public final android.accessibilityservice.BrailleDisplayController getBrailleDisplayController();

    method @NonNull @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public final android.accessibilityservice.FingerprintGestureController getFingerprintGestureController();

    method @Nullable public final android.accessibilityservice.InputMethod getInputMethod();

    method @NonNull public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();

core/java/android/accessibilityservice/AccessibilityService.java

+5 −5
Original line number Diff line number Diff line
@@ -3554,8 +3554,8 @@ public abstract class AccessibilityService extends Service { 
     * @see #OVERLAY_RESULT_INVALID

     * @see #OVERLAY_RESULT_INTERNAL_ERROR

     */

    @FlaggedApi("android.view.accessibility.a11y_overlay_callbacks")

    public void attachAccessibilityOverlayToDisplay(

    @FlaggedApi(android.view.accessibility.Flags.FLAG_A11Y_OVERLAY_CALLBACKS)

    public final void attachAccessibilityOverlayToDisplay(

            int displayId,

            @NonNull SurfaceControl sc,

            @NonNull @CallbackExecutor Executor executor,
@@ -3627,8 +3627,8 @@ public abstract class AccessibilityService extends Service { 
     * @see #OVERLAY_RESULT_INVALID

     * @see #OVERLAY_RESULT_INTERNAL_ERROR

     */

    @FlaggedApi("android.view.accessibility.a11y_overlay_callbacks")

    public void attachAccessibilityOverlayToWindow(

    @FlaggedApi(android.view.accessibility.Flags.FLAG_A11Y_OVERLAY_CALLBACKS)

    public final void attachAccessibilityOverlayToWindow(

            int accessibilityWindowId,

            @NonNull SurfaceControl sc,

            @NonNull @CallbackExecutor Executor executor,
@@ -3645,7 +3645,7 @@ public abstract class AccessibilityService extends Service { 
     */

    @FlaggedApi(android.view.accessibility.Flags.FLAG_BRAILLE_DISPLAY_HID)

    @NonNull

    public BrailleDisplayController getBrailleDisplayController() {

    public final BrailleDisplayController getBrailleDisplayController() {

        BrailleDisplayController.checkApiFlagIsEnabled();

        synchronized (mLock) {

            if (mBrailleDisplayController == null) {