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

* commit 'e69b5d68c2a52d867a614ff0ca378de4ec7d0f54':
  Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
This commit is contained in:
Amit Mahajan
2014-12-18 00:01:30 +00:00
committed by Android Git Automerger

View File

@@ -3639,6 +3639,8 @@ public class TelephonyManager {
} 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). */