diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2014-12-12 20:48:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-12 20:49:01 +0000 |
| commit | 14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c (patch) | |
| tree | e87da1b4395e903f6c855e43f1b3f97cf950cb69 /services/accessibility/java/com/android | |
| parent | 7486bc1f5a8156e9b586ebb9c32ced218e668652 (diff) | |
| parent | 09687064f4cf681d2aa299c393e32f22fc013c96 (diff) | |
| download | frameworks_base-14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c.zip frameworks_base-14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c.tar.gz frameworks_base-14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c.tar.bz2 | |
Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev
Diffstat (limited to 'services/accessibility/java/com/android')
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 63a0cf6..5ae26ef 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<AccessibilityWindowInfo> windows = new ArrayList<>(); final int windowCount = mSecurityPolicy.mWindows.size(); for (int i = 0; i < windowCount; i++) { |