From 0bae067a9932b27d6b740ef3d4ec00c8136cfabd Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Wed, 16 Apr 2014 17:18:24 -0700 Subject: [PATCH] Fix bug #14118555 NPE in settings app when it is launched by UiAutomator - prevent the potential NPE Change-Id: I428f49c4ee55fb1e8fe121b27dd12e21eced4dad --- .../android/settings/accessibility/AccessibilitySettings.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 1144985749d..0bba2e4f021 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -596,6 +596,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements final int serviceCount = services.size(); for (int i = 0; i < serviceCount; i++) { AccessibilityServiceInfo service = services.get(i); + if (service == null || service.getResolveInfo() == null) { + continue; + } SearchIndexableRaw indexable = new SearchIndexableRaw(context); indexable.title = service.getResolveInfo().loadLabel(packageManager).toString(); indexable.summaryOn = context.getString(R.string.accessibility_feature_state_on);