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

Commit 263340cf authored by Phil Weaver's avatar Phil Weaver Committed by Android (Google) Code Review
Browse files

Merge "Remove abstract from AccessibilityService methods"

parents 4bc511cb 7c01afdd

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2722,10 +2722,10 @@ package android.accessibilityservice { 
    method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();

    method public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController();

    method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();

    method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public final android.os.IBinder onBind(android.content.Intent);

    method protected boolean onGesture(int);

    method public abstract void onInterrupt();

    method public void onInterrupt();

    method protected boolean onKeyEvent(android.view.KeyEvent);

    method protected void onServiceConnected();

    method public final boolean performGlobalAction(int);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2842,10 +2842,10 @@ package android.accessibilityservice { 
    method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();

    method public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController();

    method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();

    method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public final android.os.IBinder onBind(android.content.Intent);

    method protected boolean onGesture(int);

    method public abstract void onInterrupt();

    method public void onInterrupt();

    method protected boolean onKeyEvent(android.view.KeyEvent);

    method protected void onServiceConnected();

    method public final boolean performGlobalAction(int);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2722,10 +2722,10 @@ package android.accessibilityservice { 
    method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();

    method public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController();

    method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();

    method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public final android.os.IBinder onBind(android.content.Intent);

    method protected boolean onGesture(int);

    method public abstract void onInterrupt();

    method public void onInterrupt();

    method protected boolean onKeyEvent(android.view.KeyEvent);

    method protected void onServiceConnected();

    method public final boolean performGlobalAction(int);

core/java/android/accessibilityservice/AccessibilityService.java

+2 −2
Original line number Diff line number Diff line
@@ -421,12 +421,12 @@ public abstract class AccessibilityService extends Service { 
     * this method returns. Services wishing to use the event after this method returns should

     * make a copy.

     */

    public abstract void onAccessibilityEvent(AccessibilityEvent event);

    public void onAccessibilityEvent(AccessibilityEvent event) {}



    /**

     * Callback for interrupting the accessibility feedback.

     */

    public abstract void onInterrupt();

    public void onInterrupt() {}



    /**

     * Dispatches service connection to internal components first, then the