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

Commit 5df218c5 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Android (Google) Code Review
Browse files

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev 

* changes:
  Bluetooth: expand comments on new PHY constants
  Bluetooth: document status value in PHY read/update
  Bluetooth: Add handler parameter to connectGatt
  Get rid of the IAdvertiserCallabck
parents bc6c82c2 91fe3080

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothGatt.aidl \

	core/java/android/bluetooth/IBluetoothGattCallback.aidl \

	core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \

	core/java/android/bluetooth/le/IAdvertiserCallback.aidl \

	core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl \

	core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \

	core/java/android/bluetooth/le/IScannerCallback.aidl \

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7600,6 +7600,7 @@ package android.bluetooth { 
    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int, android.os.Handler);

    method public boolean createBond();

    method public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;

    method public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8073,6 +8073,7 @@ package android.bluetooth { 
    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int, android.os.Handler);

    method public boolean createBond();

    method public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;

    method public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7631,6 +7631,7 @@ package android.bluetooth { 
    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int);

    method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int, android.os.Handler);

    method public boolean createBond();

    method public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;

    method public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;

core/java/android/bluetooth/BluetoothDevice.java

+51 −10
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.content.Context;

import android.os.Handler;

import android.os.Looper;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.ParcelUuid;
@@ -593,32 +595,38 @@ public final class BluetoothDevice implements Parcelable { 
    public static final int TRANSPORT_LE = 2;



    /**

     * Bluetooth LE 1M PHY.

     * Bluetooth LE 1M PHY. Used to refer to LE 1M Physical Channel for advertising, scanning or

     * connection.

     */

    public static final int PHY_LE_1M = 1;



    /**

     * Bluetooth LE 2M PHY.

     * Bluetooth LE 2M PHY. Used to refer to LE 2M Physical Channel for advertising, scanning or

     * connection.

     */

    public static final int PHY_LE_2M = 2;



    /**

     * Bluetooth LE Coded PHY.

     * Bluetooth LE Coded PHY. Used to refer to LE Coded Physical Channel for advertising, scanning

     * or connection.

     */

    public static final int PHY_LE_CODED = 3;



    /**

     * Bluetooth LE 1M PHY mask.

     * Bluetooth LE 1M PHY mask. Used to specify LE 1M Physical Channel as one of many available

     * options in a bitmask.

     */

    public static final int PHY_LE_1M_MASK = 1;



    /**

     * Bluetooth LE 2M PHY mask.

     * Bluetooth LE 2M PHY mask. Used to specify LE 2M Physical Channel as one of many available

     * options in a bitmask.

     */

    public static final int PHY_LE_2M_MASK = 2;



    /**

     * Bluetooth LE Coded PHY mask.

     * Bluetooth LE Coded PHY mask. Used to specify LE Coded Physical Channel as one of many

     * available options in a bitmask.

     */

    public static final int PHY_LE_CODED_MASK = 4;
@@ -1668,12 +1676,45 @@ public final class BluetoothDevice implements Parcelable { 
     *             {@link BluetoothDevice#TRANSPORT_BREDR} or {@link BluetoothDevice#TRANSPORT_LE}

     * @param phy preferred PHY for connections to remote LE device. Bitwise OR of any of

     *             {@link BluetoothDevice#PHY_LE_1M_MASK}, {@link BluetoothDevice#PHY_LE_2M_MASK},

     *             and {@link BluetoothDevice#PHY_LE_CODED_MASK}. This option does not take effect if

     *             {@code autoConnect} is set to true.

     * @throws IllegalArgumentException if callback is null

     *             and {@link BluetoothDevice#PHY_LE_CODED_MASK}. This option does not take effect

     *             if {@code autoConnect} is set to true.

     * @throws NullPointerException if callback is null

     */

    public BluetoothGatt connectGatt(Context context, boolean autoConnect,

                                     BluetoothGattCallback callback, int transport, int phy) {

        return connectGatt(context, autoConnect,callback, TRANSPORT_AUTO, PHY_LE_1M_MASK, null);

    }



    /**

     * Connect to GATT Server hosted by this device. Caller acts as GATT client.

     * The callback is used to deliver results to Caller, such as connection status as well

     * as any further GATT client operations.

     * The method returns a BluetoothGatt instance. You can use BluetoothGatt to conduct

     * GATT client operations.

     * @param callback GATT callback handler that will receive asynchronous callbacks.

     * @param autoConnect Whether to directly connect to the remote device (false)

     *                    or to automatically connect as soon as the remote

     *                    device becomes available (true).

     * @param transport preferred transport for GATT connections to remote dual-mode devices

     *             {@link BluetoothDevice#TRANSPORT_AUTO} or

     *             {@link BluetoothDevice#TRANSPORT_BREDR} or {@link BluetoothDevice#TRANSPORT_LE}

     * @param phy preferred PHY for connections to remote LE device. Bitwise OR of any of

     *             {@link BluetoothDevice#PHY_LE_1M_MASK}, {@link BluetoothDevice#PHY_LE_2M_MASK},

     *             an d{@link BluetoothDevice#PHY_LE_CODED_MASK}. This option does not take effect

     *             if {@code autoConnect} is set to true.

     * @param handler The handler to use for the callback. If {@code null}, callbacks will happen

     *             on the service's main thread.

     * @throws NullPointerException if callback is null

     */

    public BluetoothGatt connectGatt(Context context, boolean autoConnect,

                                     BluetoothGattCallback callback, int transport, int phy,

                                     Handler handler) {

        if (callback == null)

            throw new NullPointerException("callback is null");



        if (handler == null)

            handler = new Handler(Looper.getMainLooper());



        // TODO(Bluetooth) check whether platform support BLE

        //     Do the check here or in GattServer?

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
@@ -1685,7 +1726,7 @@ public final class BluetoothDevice implements Parcelable { 
                return null;

            }

            BluetoothGatt gatt = new BluetoothGatt(iGatt, this, transport, phy);

            gatt.connect(autoConnect, callback);

            gatt.connect(autoConnect, callback, handler);

            return gatt;

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return null;