Merge "Add null check to KeyEventDispatcher. am: 2a0e48aaf5 am: 2aab159e33" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-08-17 18:23:32 +00:00
committed by Android (Google) Code Review

View File

@@ -121,7 +121,7 @@ public class KeyEventDispatcher {
Service service = boundServices.get(i); Service service = boundServices.get(i);
// Key events are handled only by services that declared // Key events are handled only by services that declared
// this capability and requested to filter key events. // this capability and requested to filter key events.
if (!service.mRequestFilterKeyEvents) { if (!service.mRequestFilterKeyEvents || (service.mServiceInterface == null)) {
continue; continue;
} }
int filterKeyEventBit = service.mAccessibilityServiceInfo.getCapabilities() int filterKeyEventBit = service.mAccessibilityServiceInfo.getCapabilities()