diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-08-31 19:55:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 19:55:55 +0000 |
| commit | 3bd58233ab3ec8509a3f8922344ae30a330f5159 (patch) | |
| tree | 5b10766038807a91cf1f4b6df4adf40aa6c3c3ed /telephony | |
| parent | 69e17f59f8aaccbe66ea9ef976d01f076a7a06c3 (diff) | |
| parent | d833cb54537b81d49b6563afb7583d4b36e19c51 (diff) | |
| download | frameworks_base-3bd58233ab3ec8509a3f8922344ae30a330f5159.zip frameworks_base-3bd58233ab3ec8509a3f8922344ae30a330f5159.tar.gz frameworks_base-3bd58233ab3ec8509a3f8922344ae30a330f5159.tar.bz2 | |
am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev
* commit 'd833cb54537b81d49b6563afb7583d4b36e19c51':
Add carrier config for allowing non-emerg calls in ECM mode.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 6a0bf64..62e532e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -404,6 +404,15 @@ public class CarrierConfigManager { public static final String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl"; public static final String KEY_MMS_USER_AGENT_STRING = "userAgent"; + /** + * Determines whether the carrier supports making non-emergency phone calls while the phone is + * in emergency callback mode. Default value is {@code true}, meaning that non-emergency calls + * are allowed in emergency callback mode. + * @hide + */ + public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = + "allowNonEmergencyCallsInEcm"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -496,6 +505,7 @@ public class CarrierConfigManager { sDefaults.putString(KEY_MMS_UA_PROF_TAG_NAME_STRING, "x-wap-profile"); sDefaults.putString(KEY_MMS_UA_PROF_URL_STRING, ""); sDefaults.putString(KEY_MMS_USER_AGENT_STRING, ""); + sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true); } /** |