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

2013-04-15 21:52:07 +00:00
parent 289e64974a 1487cd5afc
commit 7af3d0560d
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();
+                    }
                }
            }