Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5470778 authored by Matthew Xie's avatar Matthew Xie
Browse files

Block ble adv api based on resource config 

bug 10516911

Change-Id: I7a62103a1116ffbf7c3c934c1794384c0e6fbdd3
parent 826debf5

core/java/android/bluetooth/BluetoothGatt.java

+8 −0
Original line number Diff line number Diff line
@@ -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;

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />