commit 7af3d0560d130e877e6ce6a1c830efa7a945d436
author Svetoslav <svetoslavganov@google.com> Mon Apr 15 21:52:07 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 15 21:52:07 2013 +0000
tree 17a88a7802fca8c601b34434f92a1baaadd1aaeb
parent 289e64974a3be70ff823ee0a0c1fe5ea32a832bb
parent 1487cd5afc23c4c8f0a069bbcf9cdb3f40692449

Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev

services/java/com/android/server/accessibility/AccessibilityManagerService.java

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index ac4f970..128a49f 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -2501,7 +2501,9 @@
             public void flush() {
                 synchronized (mLock) {
                     cancelAllPendingEventsLocked();
-                    mSentEventsVerifier.reset();
+                    if (mSentEventsVerifier != null) {
+                        mSentEventsVerifier.reset();
+                    }
                 }
             }