summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2014-12-17 23:58:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-17 23:58:11 +0000
commite69b5d68c2a52d867a614ff0ca378de4ec7d0f54 (patch)
treec55d54c284c59d62e4b1c8cf7061e977dcadfa4a /telephony/java
parent078ce5fc820d4744f5b1af384e427cedb7e90643 (diff)
parent2a65688d40dd4f82b217b53eabc63ca41b7ad73c (diff)
downloadframeworks_base-e69b5d68c2a52d867a614ff0ca378de4ec7d0f54.zip
frameworks_base-e69b5d68c2a52d867a614ff0ca378de4ec7d0f54.tar.gz
frameworks_base-e69b5d68c2a52d867a614ff0ca378de4ec7d0f54.tar.bz2
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
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index d0ddeac..c421800 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -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). */