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

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

Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" am: beb8cead 

am: cfe099b0

Change-Id: I7dda88f7c2c26cbb3ae192f313dcc4bd15afd6d6
parents 51742e58 cfe099b0

Android.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -128,8 +128,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothInputHost.aidl \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

core/java/android/bluetooth/BluetoothGatt.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -135,8 +135,8 @@ public final class BluetoothGatt implements BluetoothProfile { 
    /**

    /**

     * Bluetooth GATT callbacks. Overrides the default BluetoothGattCallback implementation.

     * Bluetooth GATT callbacks. Overrides the default BluetoothGattCallback implementation.

     */

     */

    private final IBluetoothGattCallbackExt mBluetoothGattCallback =

    private final IBluetoothGattCallback mBluetoothGattCallback =

        new IBluetoothGattCallbackExt.Stub() {

        new IBluetoothGattCallback.Stub() {

            /**

            /**

             * Application interface registered - app is ready to go

             * Application interface registered - app is ready to go

             * @hide

             * @hide

core/java/android/bluetooth/BluetoothGattServer.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -59,8 +59,8 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    /**

    /**

     * Bluetooth GATT interface callbacks

     * Bluetooth GATT interface callbacks

     */

     */

    private final IBluetoothGattServerCallbackExt mBluetoothGattServerCallback =

    private final IBluetoothGattServerCallback mBluetoothGattServerCallback =

        new IBluetoothGattServerCallbackExt.Stub() {

        new IBluetoothGattServerCallback.Stub() {

            /**

            /**

             * Application interface registered - app is ready to go

             * Application interface registered - app is ready to go

             * @hide

             * @hide

core/java/android/bluetooth/IBluetoothGatt.aidl

+4 −4
Original line number Original line Diff line number Diff line
@@ -29,8 +29,8 @@ import android.bluetooth.le.ResultStorageDescriptor; 
import android.os.ParcelUuid;

import android.os.ParcelUuid;

import android.os.WorkSource;

import android.os.WorkSource;





import android.bluetooth.IBluetoothGattCallbackExt;

import android.bluetooth.IBluetoothGattCallback;

import android.bluetooth.IBluetoothGattServerCallbackExt;

import android.bluetooth.IBluetoothGattServerCallback;

import android.bluetooth.le.IAdvertiserCallback;

import android.bluetooth.le.IAdvertiserCallback;

import android.bluetooth.le.IAdvertisingSetCallback;

import android.bluetooth.le.IAdvertisingSetCallback;

import android.bluetooth.le.IPeriodicAdvertisingCallback;

import android.bluetooth.le.IPeriodicAdvertisingCallback;
@@ -66,7 +66,7 @@ interface IBluetoothGatt { 
    void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback);

    void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback);

    void unregisterSync(in IPeriodicAdvertisingCallback callback);

    void unregisterSync(in IPeriodicAdvertisingCallback callback);





    void registerClient(in ParcelUuid appId, in IBluetoothGattCallbackExt callback);

    void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback);





    void unregisterClient(in int clientIf);

    void unregisterClient(in int clientIf);

    void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in int phy);

    void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in int phy);
@@ -88,7 +88,7 @@ interface IBluetoothGatt { 
    void configureMTU(in int clientIf, in String address, in int mtu);

    void configureMTU(in int clientIf, in String address, in int mtu);

    void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority);

    void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority);





    void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallbackExt callback);

    void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback);

    void unregisterServer(in int serverIf);

    void unregisterServer(in int serverIf);

    void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport);

    void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport);

    void serverDisconnect(in int serverIf, in String address);

    void serverDisconnect(in int serverIf, in String address);

core/java/android/bluetooth/IBluetoothGattCallbackExt.aidl→core/java/android/bluetooth/IBluetoothGattCallback.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ import android.bluetooth.BluetoothGattService; 
 * Callback definitions for interacting with BLE / GATT

 * Callback definitions for interacting with BLE / GATT

 * @hide

 * @hide

 */

 */

oneway interface IBluetoothGattCallbackExt {

oneway interface IBluetoothGattCallback {

    void onClientRegistered(in int status, in int clientIf);

    void onClientRegistered(in int status, in int clientIf);

    void onClientConnectionState(in int status, in int clientIf,

    void onClientConnectionState(in int status, in int clientIf,

                                 in boolean connected, in String address);

                                 in boolean connected, in String address);