Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4c9492b authored by Jason Monk's avatar Jason Monk
Browse files

Null check queryIntentServices 

Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
parent 3b4e4dd9

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

+6 −3
Original line number Diff line number Diff line
@@ -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);