summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-09-03 22:36:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-03 22:36:09 +0000
commit02a25a97a24e06768159ddc2b680c253a2ce71c7 (patch)
treea885ee0baa39a6449f3afc12e90cee57b92875b8 /core/res
parentf0abed57397c18f71efe47f02aa69a719390adb5 (diff)
parentc5470778a4fa8cc22e234fdcfe93fca39de63d36 (diff)
downloadframeworks_base-02a25a97a24e06768159ddc2b680c253a2ce71c7.zip
frameworks_base-02a25a97a24e06768159ddc2b680c253a2ce71c7.tar.gz
frameworks_base-02a25a97a24e06768159ddc2b680c253a2ce71c7.tar.bz2
Merge "Block ble adv api based on resource config" into klp-dev
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml3
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index d4a408d..dd233c5 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -774,6 +774,9 @@
re-validation -->
<bool name="config_bluetooth_address_validation">false</bool>
+ <!-- Boolean indicating if current platform supports BLE peripheral mode -->
+ <bool name="config_bluetooth_le_peripheral_mode_supported">false</bool>
+
<!-- The default data-use polling period. -->
<integer name="config_datause_polling_period_sec">600</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index f008b10..cce19e8 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -248,6 +248,7 @@
<java-symbol type="bool" name="config_allowActionMenuItemTextWithIcon" />
<java-symbol type="bool" name="config_bluetooth_address_validation" />
<java-symbol type="bool" name="config_bluetooth_sco_off_call" />
+ <java-symbol type="bool" name="config_bluetooth_le_peripheral_mode_supported" />
<java-symbol type="bool" name="config_cellBroadcastAppLinks" />
<java-symbol type="bool" name="config_duplicate_port_omadm_wappush" />
<java-symbol type="bool" name="config_enable_emergency_call_while_sim_locked" />