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

* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436': Crash on non-eng builds due to lacking null check.
2013-04-15 14:56:24 -07:00
parent f9dd9338d0 7af3d0560d
commit 7919ea9866
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -2501,7 +2501,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
            public void flush() {
                synchronized (mLock) {
                    cancelAllPendingEventsLocked();
-                    mSentEventsVerifier.reset();
+                    if (mSentEventsVerifier != null) {
+                        mSentEventsVerifier.reset();
+                    }
                }
            }