Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev

Browse Source 
* commit '02a25a97a24e06768159ddc2b680c253a2ce71c7':
  Block ble adv api based on resource config
This commit is contained in:
Matthew Xie
2013-09-03 15:40:14 -07:00
committed by Android Git Automerger
parent 2f3a88b4df 02a25a97a2
commit 171f8be412
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/bluetooth/BluetoothGatt.java
View File

@@ -702,6 +702,10 @@ public final class BluetoothGatt implements BluetoothProfile {
* @param start Start or stop advertising
*/
/*package*/ void listen(boolean start) {
if (mContext == null || !mContext.getResources().
getBoolean(com.android.internal.R.bool.config_bluetooth_le_peripheral_mode_supported)) {
throw new UnsupportedOperationException("BluetoothGatt#listen is blocked");
}
if (DBG) Log.d(TAG, "listen() - start: " + start);
if (mService == null || mClientIf == 0) return;
@@ -728,6 +732,10 @@ public final class BluetoothGatt implements BluetoothProfile {
/*package*/ void setAdvData(boolean advData, boolean includeName, boolean includeTxPower,
Integer minInterval, Integer maxInterval,
Integer appearance, Byte[] manufacturerData) {
if (mContext == null || !mContext.getResources().
getBoolean(com.android.internal.R.bool.config_bluetooth_le_peripheral_mode_supported)) {
throw new UnsupportedOperationException("BluetoothGatt#setAdvData is blocked");
}
if (DBG) Log.d(TAG, "setAdvData()");
if (mService == null || mClientIf == 0) return;

3
core/res/res/values/config.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -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" />