diff options
author | Tyler Gunn <tgunn@google.com> | 2015-08-31 21:01:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-31 21:01:19 +0000 |
commit | 7878eee8a9c20752e038f563b98b6b42c372cd0f (patch) | |
tree | 8bf4bc6a493ef3b5872bd3ee44e02c2d6867e9d6 /telephony | |
parent | a7cad8e8a4d698bd3880299265760f5158073e2d (diff) | |
parent | 6ef57c3366a3b85e92cf796828aa9832202c8e39 (diff) | |
download | frameworks_base-7878eee8a9c20752e038f563b98b6b42c372cd0f.zip frameworks_base-7878eee8a9c20752e038f563b98b6b42c372cd0f.tar.gz frameworks_base-7878eee8a9c20752e038f563b98b6b42c372cd0f.tar.bz2 |
Merge "Rename carrier config constant." into mnc-dr-dev
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 2 |
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; |