PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Null check queryIntentServices

Browse Source 
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
This commit is contained in:
Jason Monk
2015-11-09 16:56:46 -05:00
parent 3b4e4dd91d
commit a4c9492b50
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/search/DynamicIndexableContentMonitor.java
View File

@@ -233,7 +233,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
private void handlePackageAvailable(String packageName) { private void handlePackageAvailable(String packageName) {
if (!mAccessibilityServices.contains(packageName)) { if (!mAccessibilityServices.contains(packageName)) {
final Intent intent = getAccessibilityServiceIntent(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); mAccessibilityServices.add(packageName);
Index.getInstance(mContext).updateFromClassNameResource( Index.getInstance(mContext).updateFromClassNameResource(
AccessibilitySettings.class.getName(), false, true); AccessibilitySettings.class.getName(), false, true);
@@ -243,7 +244,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
if (mHasFeaturePrinting) { if (mHasFeaturePrinting) {
if (!mPrintServices.contains(packageName)) { if (!mPrintServices.contains(packageName)) {
final Intent intent = getPrintServiceIntent(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); mPrintServices.add(packageName);
Index.getInstance(mContext).updateFromClassNameResource( Index.getInstance(mContext).updateFromClassNameResource(
PrintSettingsFragment.class.getName(), false, true); PrintSettingsFragment.class.getName(), false, true);
@@ -254,7 +256,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme
if (mHasFeatureIme) { if (mHasFeatureIme) {
if (!mImeServices.contains(packageName)) { if (!mImeServices.contains(packageName)) {
Intent intent = getIMEServiceIntent(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); mImeServices.add(packageName);
Index.getInstance(mContext).updateFromClassNameResource( Index.getInstance(mContext).updateFromClassNameResource(
InputMethodAndLanguageSettings.class.getName(), false, true); InputMethodAndLanguageSettings.class.getName(), false, true);