diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-04-15 21:52:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 21:52:07 +0000 |
| commit | 7af3d0560d130e877e6ce6a1c830efa7a945d436 (patch) | |
| tree | 17a88a7802fca8c601b34434f92a1baaadd1aaeb /services/java/com/android/server/accessibility/AccessibilityManagerService.java | |
| parent | 289e64974a3be70ff823ee0a0c1fe5ea32a832bb (diff) | |
| parent | 1487cd5afc23c4c8f0a069bbcf9cdb3f40692449 (diff) | |
| download | frameworks_base-7af3d0560d130e877e6ce6a1c830efa7a945d436.zip frameworks_base-7af3d0560d130e877e6ce6a1c830efa7a945d436.tar.gz frameworks_base-7af3d0560d130e877e6ce6a1c830efa7a945d436.tar.bz2 | |
Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev
Diffstat (limited to 'services/java/com/android/server/accessibility/AccessibilityManagerService.java')
| -rw-r--r-- | services/java/com/android/server/accessibility/AccessibilityManagerService.java | 4 |
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 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 class AccessibilityManagerService extends IAccessibilityManager.Stub { public void flush() { synchronized (mLock) { cancelAllPendingEventsLocked(); - mSentEventsVerifier.reset(); + if (mSentEventsVerifier != null) { + mSentEventsVerifier.reset(); + } } } |