summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-04-15 12:28:42 -0700
committerSvetoslav <svetoslavganov@google.com>2013-04-15 12:28:46 -0700
commit1487cd5afc23c4c8f0a069bbcf9cdb3f40692449 (patch)
tree632556ff6e39fcb1d07209eb3d738bad8d611eda
parentfb5e6bbd2bf9ad8a71fc798be3ef12b950476f43 (diff)
downloadframeworks_base-1487cd5afc23c4c8f0a069bbcf9cdb3f40692449.zip
frameworks_base-1487cd5afc23c4c8f0a069bbcf9cdb3f40692449.tar.gz
frameworks_base-1487cd5afc23c4c8f0a069bbcf9cdb3f40692449.tar.bz2
Crash on non-eng builds due to lacking null check.
On eng builds we have an event consistency verifier to log any inconsistent event stream states due to mishandling of intercepted events by an accessibility service. On non-eng builds this verifier is null and a null check was lacking. bug:8616711 Change-Id: Ib083a405dfa8340025090a65e50155eb10526a90
-rw-r--r--services/java/com/android/server/accessibility/AccessibilityManagerService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index 110c4da..0619b88 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -2499,7 +2499,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
public void flush() {
synchronized (mLock) {
cancelAllPendingEventsLocked();
- mSentEventsVerifier.reset();
+ if (mSentEventsVerifier != null) {
+ mSentEventsVerifier.reset();
+ }
}
}