commit 46742e0cf933abfcf65be9009cd9262863280c34
author Jason Monk <jmonk@google.com> Mon Nov 09 16:56:46 2015 -0500
committer The Android Automerger <android-build@google.com> Mon Nov 09 17:01:03 2015 -0800
tree 6f538ab364ad919d9fe3cbdb114bfc6a1247ad74
parent 91e50a268c8ea358fe1142611d117cd8a74ec9cf

Null check queryIntentServices

Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3

src/com/android/settings/search/DynamicIndexableContentMonitor.java

diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index 12bb6ef..e11f564 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -233,7 +233,8 @@
     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 @@
         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 @@
         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);