From 09687064f4cf681d2aa299c393e32f22fc013c96 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Thu, 11 Dec 2014 22:59:08 -0800 Subject: [PATCH] Fix a NPE in AccessiiblityManagerService. It is possible that the accessibility windows list is null which is treated as if there is no window information. The getWindows method was accessing properties of the windows filed witgout a null check. bug:18522998 Change-Id: Ieefe678d3da3d6e8f96c0e4bedac0c55975621fa --- .../server/accessibility/AccessibilityManagerService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 89aebe8dd7957..698d474907782 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -2145,6 +2145,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { if (!permissionGranted) { return null; } + if (mSecurityPolicy.mWindows == null) { + return null; + } List windows = new ArrayList<>(); final int windowCount = mSecurityPolicy.mWindows.size(); for (int i = 0; i < windowCount; i++) {