diff options
| author | 2016-08-16 19:33:27 +0000 | |
|---|---|---|
| committer | 2016-08-16 19:33:28 +0000 | |
| commit | 49b684d562f5dc4f10d580039c03f40255224d4b (patch) | |
| tree | ddce531ab923f4ac79347ffcaf68c1e76055fe7d | |
| parent | e68228fbd9f5cc07a5afa29ffc75a06bbf3f4cd1 (diff) | |
| parent | 2a0e48aaf5fe309c3a4fd6ab761be8129e95f57a (diff) | |
Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java index e03c16e25fc2..e8f93b89bc0c 100644 --- 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() |