Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev

2016-08-16 19:33:27 +00:00
parent e68228fbd9 2a0e48aaf5
commit 49b684d562
1 changed files with 1 additions and 1 deletions
--- a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
+++ b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
@@ -121,7 +121,7 @@ public class KeyEventDispatcher {
            Service service = boundServices.get(i);
            // Key events are handled only by services that declared
            // this capability and requested to filter key events.
-            if (!service.mRequestFilterKeyEvents) {
+            if (!service.mRequestFilterKeyEvents || (service.mServiceInterface == null)) {
                continue;
            }
            int filterKeyEventBit = service.mAccessibilityServiceInfo.getCapabilities()