From 1487cd5afc23c4c8f0a069bbcf9cdb3f40692449 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Mon, 15 Apr 2013 12:28:42 -0700
Subject: [PATCH] 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
---
 .../server/accessibility/AccessibilityManagerService.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index 110c4dadc201c..0619b8844e521 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();
+                    }
                 }
             }