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

Fix crash in print settings utils

Browse Source 
Change-Id: I8000b674c0579988d6dfae2fcff136a06c721362
This commit is contained in:
Svetoslav
2015-02-03 21:58:11 -08:00
parent 29c99f1534
commit b428346fd3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/print/PrintSettingsUtils.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.print;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils;
import android.text.TextUtils.SimpleStringSplitter; import android.text.TextUtils.SimpleStringSplitter;
import java.util.ArrayList;import java.util.List; import java.util.ArrayList;import java.util.List;
@@ -39,7 +40,7 @@ public class PrintSettingsUtils {
String enabledServicesSetting = Settings.Secure.getString(context String enabledServicesSetting = Settings.Secure.getString(context
.getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES); .getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES);
if (enabledServicesSetting == null) { if (TextUtils.isEmpty(enabledServicesSetting)) {
return enabledServices; return enabledServices;
} }
@@ -51,7 +52,9 @@ public class PrintSettingsUtils {
String componentNameString = colonSplitter.next(); String componentNameString = colonSplitter.next();
ComponentName enabledService = ComponentName.unflattenFromString( ComponentName enabledService = ComponentName.unflattenFromString(
componentNameString); componentNameString);
enabledServices.add(enabledService); if (enabledService != null) {
enabledServices.add(enabledService);
}
} }
return enabledServices; return enabledServices;