summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-08-31 21:14:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-31 21:14:55 +0000
commit6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2 (patch)
treee2492e4a5452e4450bb49f07d42a0b68c8141d49 /telephony/java
parentb8645fa79e06c2e5cb87eb7fddccf3d2679c5f71 (diff)
parent7878eee8a9c20752e038f563b98b6b42c372cd0f (diff)
downloadframeworks_base-6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2.zip
frameworks_base-6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2.tar.gz
frameworks_base-6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2.tar.bz2
am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '7878eee8a9c20752e038f563b98b6b42c372cd0f': Rename carrier config constant.
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 62e532e..df8affe 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -411,7 +411,7 @@ public class CarrierConfigManager {
* @hide
*/
public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL =
- "allowNonEmergencyCallsInEcm";
+ "allow_non_emergency_calls_in_ecm_bool";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;