diff options
author | Bryce Lee <brycelee@google.com> | 2015-10-26 23:23:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-26 23:23:26 +0000 |
commit | 0ed10ba50b775e760573998b5ac891346dfb717e (patch) | |
tree | ba7ed7b9c2386d3062c06e3123a438c5296c067f /res | |
parent | 1b44858b54f2cfa59901bfe63b50a64c7017945a (diff) | |
parent | 411bdc12726036c7785d347bb33cddb410a02cd9 (diff) | |
download | android_packages_services_Telephony-0ed10ba50b775e760573998b5ac891346dfb717e.tar.gz android_packages_services_Telephony-0ed10ba50b775e760573998b5ac891346dfb717e.tar.bz2 android_packages_services_Telephony-0ed10ba50b775e760573998b5ac891346dfb717e.zip |
Merge "Allow for PSTN accounts to be marked as not emergency call capable." into cw-e-dev
am: 411bdc1272
* commit '411bdc12726036c7785d347bb33cddb410a02cd9':
Allow for PSTN accounts to be marked as not emergency call capable.
Diffstat (limited to 'res')
-rw-r--r-- | res/values/config.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index fbbbcd624..0b1f93c8e 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -215,4 +215,7 @@ <!-- Flag indicating whether the the emergency phone account should be emergency calls only --> <bool name="config_emergency_account_emergency_calls_only">false</bool> + + <!-- Whether the emergency only account can make emergency calls --> + <bool name="config_pstnCanPlaceEmergencyCalls">true</bool> </resources> |