From 2a0e48aaf5fe309c3a4fd6ab761be8129e95f57a Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Mon, 15 Aug 2016 17:49:55 -0700
Subject: [PATCH] Add null check to KeyEventDispatcher.

Make sure we don't try to dispatch key events to services
that have died. Doing so crashes the device.

Bug: 30866905
Change-Id: I1cc0515cca8924b0c2744de98ac75a901b94246d
---
 .../com/android/server/accessibility/KeyEventDispatcher.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
index e03c16e25fc2c..e8f93b89bc0cd 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()