diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-08-31 21:14:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 21:14:55 +0000 |
| commit | 6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2 (patch) | |
| tree | e2492e4a5452e4450bb49f07d42a0b68c8141d49 /telephony | |
| parent | b8645fa79e06c2e5cb87eb7fddccf3d2679c5f71 (diff) | |
| parent | 7878eee8a9c20752e038f563b98b6b42c372cd0f (diff) | |
| download | frameworks_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')
| -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; |