summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bryce Lee <brycelee@google.com> 2015-10-26 17:08:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-10-26 17:08:49 +0000
commit521ac43fe581ee55fb8acf98bf52af622e03e9b1 (patch)
tree1597ee43fc992be20544a9cabf70b2b2224f1407
parent609444dff3df707589fb2b26e86338618618b871 (diff)
parentc2f421a869ed68339dfb039e2628e6330e543634 (diff)
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev
-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 1c7af3e0c17c..392e503ea4ef 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 ba34823cf44f..7754f865b765 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" />