From 7c01afdd18fd4e81c0bfff2f9062b752a13576a5 Mon Sep 17 00:00:00 2001 From: Phil Weaver Date: Wed, 22 Feb 2017 12:54:40 -0800 Subject: [PATCH] Remove abstract from AccessibilityService methods Two methods on AccessibilityService were declared abstract, but there doesn't seem to be a good reason for them to be abstract, as it's possible to write an accessibility service that doesn't do anything useful with the methods. Removing the abstract qualifier to reduce boilerplate for service developers. Bug: 31705365 Test: Trivial change, so I just verified that it builds. Change-Id: I2af39848c8ab343d562361fdc1c3f8ca3ecb5f00 --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- .../android/accessibilityservice/AccessibilityService.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/current.txt b/api/current.txt index 67cdc9cb0a5b7..6a5bcb963beb9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 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); diff --git a/api/system-current.txt b/api/system-current.txt index dcd210334d492..d37fec74987b5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 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); diff --git a/api/test-current.txt b/api/test-current.txt index 319d9f34da752..07ccc671d9c45 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 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); diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index b4e119e52fb74..38847489eb648 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -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