summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2014-11-11 13:51:31 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-11-11 22:06:44 +0000
commitd7a8a5d37636c777c263b389ba8adb09f3b18bc0 (patch)
tree719202a1bbbeb2e5bea8d7a7a3c8cdc0790428cf
parent7a15c8a931190669463deff9fde1f6ef47f24b4a (diff)
downloadandroid_frameworks_base-d7a8a5d37636c777c263b389ba8adb09f3b18bc0.tar.gz
android_frameworks_base-d7a8a5d37636c777c263b389ba8adb09f3b18bc0.tar.bz2
android_frameworks_base-d7a8a5d37636c777c263b389ba8adb09f3b18bc0.zip
SettingsProvider: fix load protected sms setting logic
The method assumed a string resource, but we are working with string-arrays. Change-Id: I7d03821c5f5ac5d24445e5c03f7911c3a81c16dd Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 7639a31c378..2ff2b5a8b77 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2078,10 +2078,10 @@ public class DatabaseHelper extends SQLiteOpenHelper {
}
private void loadProtectedSmsSetting(SQLiteStatement stmt) {
- String regAddresses = mContext.getResources()
- .getString(R.array.def_protected_sms_list_values);
- if (!TextUtils.isEmpty(regAddresses)) {
- loadSetting(stmt, Settings.Secure.PROTECTED_SMS_ADDRESSES, regAddresses);
+ String[] regAddresses = mContext.getResources()
+ .getStringArray(R.array.def_protected_sms_list_values);
+ if (regAddresses.length > 0) {
+ loadSetting(stmt, Settings.Secure.PROTECTED_SMS_ADDRESSES, TextUtils.join("|", regAddresses));
}
}