summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-06-10 09:50:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-10 09:50:24 -0700
commit86bbf70587602c1fd86fce1a2a4be78da45aaedc (patch)
tree601c81e3f2818f2b4fdfe4428c7b72a42e68010d /services/java/com
parent2e6f9be5633cf37223425b9b93c0b1512db091af (diff)
parentee33ad24cdc31ed0d7f99e110e041b0a63c9b0f1 (diff)
downloadframeworks_base-86bbf70587602c1fd86fce1a2a4be78da45aaedc.zip
frameworks_base-86bbf70587602c1fd86fce1a2a4be78da45aaedc.tar.gz
frameworks_base-86bbf70587602c1fd86fce1a2a4be78da45aaedc.tar.bz2
Merge "Settings crash after enabling TalkBack accessibility." into jb-dev
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/accessibility/AccessibilityInputFilter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
index baa2f54..8fa6722 100644
--- a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
+++ b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
@@ -123,6 +123,8 @@ public class AccessibilityInputFilter extends InputFilter {
}
public void onAccessibilityEvent(AccessibilityEvent event) {
- mTouchExplorer.onAccessibilityEvent(event);
+ if (mTouchExplorer != null) {
+ mTouchExplorer.onAccessibilityEvent(event);
+ }
}
}