diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2014-12-12 21:02:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 21:02:30 +0000 |
| commit | 9b3ab29ffa6b3f67b5ab7c06338a2c76db59e176 (patch) | |
| tree | 16800eea612b7de3c05c0cb35038928dfe35dbd2 /services/accessibility | |
| parent | 1301446c01182b41c3f922121d21ed9b383cc4df (diff) | |
| parent | 26c8895465bbc94efb0cc96460e5eabe88382698 (diff) | |
| download | frameworks_base-9b3ab29ffa6b3f67b5ab7c06338a2c76db59e176.zip frameworks_base-9b3ab29ffa6b3f67b5ab7c06338a2c76db59e176.tar.gz frameworks_base-9b3ab29ffa6b3f67b5ab7c06338a2c76db59e176.tar.bz2 | |
am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev
* commit '26c8895465bbc94efb0cc96460e5eabe88382698':
Fix a NPE in AccessiiblityManagerService.
Diffstat (limited to 'services/accessibility')
| -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++) { |