summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-10-26 17:18:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-26 17:18:14 +0000
commit4c42942d539ee1ad3511b37d5f1d6e17da684103 (patch)
treec9145bdc2a101a9332fa5bcad7fb94e3970974e8 /core/res
parent65b9942a6c381eda6433c1a679c6070144565d8a (diff)
parent521ac43fe581ee55fb8acf98bf52af622e03e9b1 (diff)
downloadframeworks_base-4c42942d539ee1ad3511b37d5f1d6e17da684103.zip
frameworks_base-4c42942d539ee1ad3511b37d5f1d6e17da684103.tar.gz
frameworks_base-4c42942d539ee1ad3511b37d5f1d6e17da684103.tar.bz2
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev
am: 521ac43fe5 * commit '521ac43fe581ee55fb8acf98bf52af622e03e9b1': Add Telecom config bool to require a phone account to be present for handle
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml4
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 1c7af3e..392e503 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1288,6 +1288,10 @@
device is data-only. -->
<bool name="config_voice_capable">true</bool>
+ <!-- Flag indicating that an outbound call must have a call capable phone account
+ that has declared it can process the call's handle. -->
+ <bool name="config_requireCallCapableAccountForHandle">false</bool>
+
<!-- Flag indicating if the user is notified when the mobile network access is restricted -->
<bool name="config_user_notification_of_restrictied_mobile_access">true</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ba34823..7754f86 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -274,6 +274,7 @@
<java-symbol type="bool" name="config_ui_enableFadingMarquee" />
<java-symbol type="bool" name="config_use_strict_phone_number_comparation" />
<java-symbol type="bool" name="config_voice_capable" />
+ <java-symbol type="bool" name="config_requireCallCapableAccountForHandle" />
<java-symbol type="bool" name="config_user_notification_of_restrictied_mobile_access" />
<java-symbol type="bool" name="config_wifiDisplaySupportsProtectedBuffers" />
<java-symbol type="bool" name="preferences_prefer_dual_pane" />