summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2015-08-31 21:25:17 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-31 21:25:17 +0000
commit603cfdcea1e53f963b27d33bb1f0579a619cc9ca (patch)
tree919c6a49a5f553d553b897db493ec629f835eb44
parent406b60aca6c8b88f35c15ddbb30937fd6cfdc008 (diff)
parent6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2 (diff)
am 6a9baca0: am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2': Rename carrier config constant.
-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 62e532e81b89..df8affef8f46 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;