Add null check to a11y interrupt.
Also adding same robustness to interrupt that we have for
sending a11y events.
Bug: 32507871
Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit 867ad35d9c)
This commit is contained in:
committed by
vinodkrishnan
parent
1838237435
commit
74f9e1b867
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user