Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: ea1656f

* commit 'ea1656f408376d71b124d1ea62116862731aa4ab':
  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:05:30 +00:00
committed by android-build-merger
parent faf2190334 ea1656f408
commit dba700ef43
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3635,6 +3635,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). */