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

Commit 593af941 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 171f8be4: am c2fe8804: Merge "Block ble adv api based on resource config" into klp-dev 

* commit '171f8be41215c2d9662c2da29329e9c4040fc3e0':
  Block ble adv api based on resource config
parents a39b0e60 c2fe8804

framework/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;