summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorJonathan Basseri <misterikkit@google.com>2015-06-03 20:59:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-03 20:59:13 +0000
commitb06411a90fcaaa6d2bb295174c97d4b7a124eea9 (patch)
tree2fd5f99da71bc618caf538e43b5a5df5ac1be250 /telephony/java/android
parent8fd48ca377956e434819ade33a9970cd66a2fda7 (diff)
parent08e318e5868b4f21a95fd1b5e8b9659e2d830257 (diff)
downloadframeworks_base-b06411a90fcaaa6d2bb295174c97d4b7a124eea9.zip
frameworks_base-b06411a90fcaaa6d2bb295174c97d4b7a124eea9.tar.gz
frameworks_base-b06411a90fcaaa6d2bb295174c97d4b7a124eea9.tar.bz2
Merge "Document procedure for adding carrier config variables." into mnc-dev
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 1d751d5..dfb02bb 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -51,6 +51,10 @@ public class CarrierConfigManager {
public static final String
ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
+ // Below are the keys used in carrier config bundles. To add a new variable, define the key and
+ // give it a default value in sDefaults. If you need to ship a per-network override in the
+ // system image, that can be added in packages/apps/CarrierConfig.
+
/**
* Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED
* events from the Sim.