Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null check to a11y interrupt.

Browse Source 
am: 74f9e1b867

Change-Id: I8bb63b88a12ab6f8dfae42918ab9fdf4b1a457b5
This commit is contained in:
Phil Weaver
2016-12-15 19:04:59 +00:00
committed by android-build-merger
parent 92cd0ce92d 74f9e1b867
commit 718f403b50
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/view/accessibility/AccessibilityManager.java
View File

@@ -353,7 +353,18 @@ public final class AccessibilityManager {
return;
}
if (!mIsEnabled) {
throw new IllegalStateException("Accessibility off. Did you forget to check that?");
Looper myLooper = Looper.myLooper();
if (myLooper == Looper.getMainLooper()) {
throw new IllegalStateException(
"Accessibility off. Did you forget to check that?");
} else {
// If we're not running on the thread with the main looper, it's possible for
// the state of accessibility to change between checking isEnabled and
// calling this method. So just log the error rather than throwing the
// exception.
Log.e(LOG_TAG, "Interrupt called with accessibility disabled");
return;
}
}
userId = mUserId;
}

23
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -538,7 +538,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
@Override
public void interrupt(int userId) {
CopyOnWriteArrayList<Service> services;
List<IAccessibilityServiceClient> interfacesToInterrupt;
synchronized (mLock) {
// We treat calls from a profile as if made by its parent as profiles
// share the accessibility state of the parent. The call below
@@ -549,15 +549,24 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
if (resolvedUserId != mCurrentUserId) {
return;
}
services = getUserStateLocked(resolvedUserId).mBoundServices;
List<Service> services = getUserStateLocked(resolvedUserId).mBoundServices;
int numServices = services.size();
interfacesToInterrupt = new ArrayList<>(numServices);
for (int i = 0; i < numServices; i++) {
Service service = services.get(i);
IBinder a11yServiceBinder = service.mService;
IAccessibilityServiceClient a11yServiceInterface = service.mServiceInterface;
if ((a11yServiceBinder != null) && (a11yServiceInterface != null)) {
interfacesToInterrupt.add(a11yServiceInterface);
}
}
}
for (int i = 0, count = services.size(); i < count; i++) {
Service service = services.get(i);
for (int i = 0, count = interfacesToInterrupt.size(); i < count; i++) {
try {
service.mServiceInterface.onInterrupt();
interfacesToInterrupt.get(i).onInterrupt();
} catch (RemoteException re) {
Slog.e(LOG_TAG, "Error during sending interrupt request to "
+ service.mService, re);
Slog.e(LOG_TAG, "Error sending interrupt request to "
+ interfacesToInterrupt.get(i), re);
}
}
}