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

Commit 343ef5d0 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c4 am: 3d95c68d 

am: 6260ea5a

Change-Id: I5d45b8a8a33394d7e50479a4a4a920c59e999965
parents 5bc54aad 6260ea5a

core/java/android/bluetooth/BluetoothGattCallback.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -30,7 +30,8 @@ public abstract class BluetoothGattCallback{ 
     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     * @param status status of the operation

     * @param status Status of the PHY update operation.

     *                  {@link BluetoothGatt#GATT_SUCCESS} if the operation succeeds.

     */

     */

    public void onPhyUpdate(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {

    public void onPhyUpdate(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {

    }

    }
@@ -43,7 +44,8 @@ public abstract class BluetoothGattCallback{ 
     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.

     * @param status status of the operation

     * @param status Status of the PHY read operation.

     *                  {@link BluetoothGatt#GATT_SUCCESS} if the operation succeeds.

     */

     */

    public void onPhyRead(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {

    public void onPhyRead(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {

    }

    }

core/java/android/bluetooth/BluetoothGattServerCallback.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -167,7 +167,8 @@ public abstract class BluetoothGattServerCallback { 
     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     * @param status status of the operation

     * @param status Status of the PHY update operation.

     *                  {@link BluetoothGatt#GATT_SUCCESS} if the operation succeeds.

     */

     */

    public void onPhyUpdate(BluetoothDevice device, int txPhy, int rxPhy, int status) {

    public void onPhyUpdate(BluetoothDevice device, int txPhy, int rxPhy, int status) {

    }

    }
@@ -180,7 +181,8 @@ public abstract class BluetoothGattServerCallback { 
     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     * @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     *             {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}

     * @param status status of the operation

     * @param status Status of the PHY read operation.

     *                  {@link BluetoothGatt#GATT_SUCCESS} if the operation succeeds.

     */

     */

    public void onPhyRead(BluetoothDevice device, int txPhy, int rxPhy, int status) {

    public void onPhyRead(BluetoothDevice device, int txPhy, int rxPhy, int status) {

    }

    }