diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2014-12-18 00:03:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-18 00:03:08 +0000 |
| commit | ea1656f408376d71b124d1ea62116862731aa4ab (patch) | |
| tree | 7a80733b66fa2332d6b056c32d0a03c9640ac561 /telephony | |
| parent | d946753aa4ac3ac9b16ff1627a19fb05f1608660 (diff) | |
| parent | eac6db511b02ebf398a5e70eb70a7a5f05133945 (diff) | |
| download | frameworks_base-ea1656f408376d71b124d1ea62116862731aa4ab.zip frameworks_base-ea1656f408376d71b124d1ea62116862731aa4ab.tar.gz frameworks_base-ea1656f408376d71b124d1ea62116862731aa4ab.tar.bz2 | |
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
* commit 'eac6db511b02ebf398a5e70eb70a7a5f05133945':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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). */ |