am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev automerge: eac6db5
automerge: ea1656f
* commit 'ea1656f408376d71b124d1ea62116862731aa4ab':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index ccd0db6..d19a702 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3635,6 +3635,8 @@
} catch (SettingNotFoundException e) {
try {
int val = Settings.Global.getInt(cr, name);
+ Settings.Global.putInt(cr, name + subId, val);
+
/* We are now moving from 'setting' to 'setting+subId', and using the value stored
* for 'setting' as default. Reset the default (since it may have a user set
* value). */