From a4c9492b50b742488a6a92abdc290b5ada3c004b Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 9 Nov 2015 16:56:46 -0500 Subject: [PATCH] Null check queryIntentServices Bug: 25575738 Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3 --- .../settings/search/DynamicIndexableContentMonitor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java index 12bb6ef2459..e11f564a63e 100644 --- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java +++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java @@ -233,7 +233,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme private void handlePackageAvailable(String packageName) { if (!mAccessibilityServices.contains(packageName)) { final Intent intent = getAccessibilityServiceIntent(packageName); - if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { + List services = mContext.getPackageManager().queryIntentServices(intent, 0); + if (services != null && !services.isEmpty()) { mAccessibilityServices.add(packageName); Index.getInstance(mContext).updateFromClassNameResource( AccessibilitySettings.class.getName(), false, true); @@ -243,7 +244,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme if (mHasFeaturePrinting) { if (!mPrintServices.contains(packageName)) { final Intent intent = getPrintServiceIntent(packageName); - if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { + List services = mContext.getPackageManager().queryIntentServices(intent, 0); + if (services != null && !services.isEmpty()) { mPrintServices.add(packageName); Index.getInstance(mContext).updateFromClassNameResource( PrintSettingsFragment.class.getName(), false, true); @@ -254,7 +256,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme if (mHasFeatureIme) { if (!mImeServices.contains(packageName)) { Intent intent = getIMEServiceIntent(packageName); - if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { + List services = mContext.getPackageManager().queryIntentServices(intent, 0); + if (services != null && !services.isEmpty()) { mImeServices.add(packageName); Index.getInstance(mContext).updateFromClassNameResource( InputMethodAndLanguageSettings.class.getName(), false, true);