Fix bug #14118555 NPE in settings app when it is launched by UiAutomator
- prevent the potential NPE
Change-Id: I428f49c4ee55fb1e8fe121b27dd12e21eced4dad
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 1144985..0bba2e4 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -596,6 +596,9 @@
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);