diff options
author | Svetoslav <svetoslavganov@google.com> | 2015-02-03 21:58:11 -0800 |
---|---|---|
committer | Svetoslav <svetoslavganov@google.com> | 2015-02-03 21:58:11 -0800 |
commit | b428346fd3580a7c1c2e1e9ab149441fafd48bf3 (patch) | |
tree | fc3aa2b0a527c691af2ac7e2d5e9578ec30821f6 | |
parent | 29c99f1534ed5b3638a047b0651fa0d10f2c3c35 (diff) | |
download | packages_apps_Settings-b428346fd3580a7c1c2e1e9ab149441fafd48bf3.zip packages_apps_Settings-b428346fd3580a7c1c2e1e9ab149441fafd48bf3.tar.gz packages_apps_Settings-b428346fd3580a7c1c2e1e9ab149441fafd48bf3.tar.bz2 |
Fix crash in print settings utils
Change-Id: I8000b674c0579988d6dfae2fcff136a06c721362
-rw-r--r-- | src/com/android/settings/print/PrintSettingsUtils.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/print/PrintSettingsUtils.java b/src/com/android/settings/print/PrintSettingsUtils.java index 24f20d5..ad866a0 100644 --- a/src/com/android/settings/print/PrintSettingsUtils.java +++ b/src/com/android/settings/print/PrintSettingsUtils.java @@ -19,6 +19,7 @@ package com.android.settings.print; import android.content.ComponentName; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; import android.text.TextUtils.SimpleStringSplitter; import java.util.ArrayList;import java.util.List; @@ -39,7 +40,7 @@ public class PrintSettingsUtils { String enabledServicesSetting = Settings.Secure.getString(context .getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES); - if (enabledServicesSetting == null) { + if (TextUtils.isEmpty(enabledServicesSetting)) { return enabledServices; } @@ -51,7 +52,9 @@ public class PrintSettingsUtils { String componentNameString = colonSplitter.next(); ComponentName enabledService = ComponentName.unflattenFromString( componentNameString); - enabledServices.add(enabledService); + if (enabledService != null) { + enabledServices.add(enabledService); + } } return enabledServices; |