From d7116bea0698f58e93003d2046411a2624dd1ab1 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Mon, 27 Mar 2017 12:14:40 -0700 Subject: [PATCH] Bluetooth GATT callback naming fix "Ext" -> "" (1/2) Gatt callback don't need the "Ext" postfix, as it was removed from new API. Test: manual Bug: 30622771 Change-Id: I54596ffdcb818343cc313123266cfa16291c6236 --- Android.mk | 4 ++-- core/java/android/bluetooth/BluetoothGatt.java | 4 ++-- core/java/android/bluetooth/BluetoothGattServer.java | 4 ++-- core/java/android/bluetooth/IBluetoothGatt.aidl | 8 ++++---- ...thGattCallbackExt.aidl => IBluetoothGattCallback.aidl} | 2 +- ...CallbackExt.aidl => IBluetoothGattServerCallback.aidl} | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename core/java/android/bluetooth/{IBluetoothGattCallbackExt.aidl => IBluetoothGattCallback.aidl} (97%) rename core/java/android/bluetooth/{IBluetoothGattServerCallbackExt.aidl => IBluetoothGattServerCallback.aidl} (97%) diff --git a/Android.mk b/Android.mk index a07fd016eab85..7f338f92acd56 100644 --- a/Android.mk +++ b/Android.mk @@ -128,8 +128,8 @@ LOCAL_SRC_FILES += \ core/java/android/bluetooth/IBluetoothInputHost.aidl \ core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ core/java/android/bluetooth/IBluetoothGatt.aidl \ - core/java/android/bluetooth/IBluetoothGattCallbackExt.aidl \ - core/java/android/bluetooth/IBluetoothGattServerCallbackExt.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 \ diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index a314aaf96acda..99ca11ece50b4 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -135,8 +135,8 @@ public final class BluetoothGatt implements BluetoothProfile { /** * Bluetooth GATT callbacks. Overrides the default BluetoothGattCallback implementation. */ - private final IBluetoothGattCallbackExt mBluetoothGattCallback = - new IBluetoothGattCallbackExt.Stub() { + private final IBluetoothGattCallback mBluetoothGattCallback = + new IBluetoothGattCallback.Stub() { /** * Application interface registered - app is ready to go * @hide diff --git a/core/java/android/bluetooth/BluetoothGattServer.java b/core/java/android/bluetooth/BluetoothGattServer.java index c991e2f71bb8c..b35a593359399 100644 --- a/core/java/android/bluetooth/BluetoothGattServer.java +++ b/core/java/android/bluetooth/BluetoothGattServer.java @@ -59,8 +59,8 @@ public final class BluetoothGattServer implements BluetoothProfile { /** * Bluetooth GATT interface callbacks */ - private final IBluetoothGattServerCallbackExt mBluetoothGattServerCallback = - new IBluetoothGattServerCallbackExt.Stub() { + private final IBluetoothGattServerCallback mBluetoothGattServerCallback = + new IBluetoothGattServerCallback.Stub() { /** * Application interface registered - app is ready to go * @hide diff --git a/core/java/android/bluetooth/IBluetoothGatt.aidl b/core/java/android/bluetooth/IBluetoothGatt.aidl index 652a1c6098f29..0825ee88a4568 100644 --- a/core/java/android/bluetooth/IBluetoothGatt.aidl +++ b/core/java/android/bluetooth/IBluetoothGatt.aidl @@ -29,8 +29,8 @@ import android.bluetooth.le.ResultStorageDescriptor; import android.os.ParcelUuid; import android.os.WorkSource; -import android.bluetooth.IBluetoothGattCallbackExt; -import android.bluetooth.IBluetoothGattServerCallbackExt; +import android.bluetooth.IBluetoothGattCallback; +import android.bluetooth.IBluetoothGattServerCallback; import android.bluetooth.le.IAdvertiserCallback; import android.bluetooth.le.IAdvertisingSetCallback; 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 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 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 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 serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport); void serverDisconnect(in int serverIf, in String address); diff --git a/core/java/android/bluetooth/IBluetoothGattCallbackExt.aidl b/core/java/android/bluetooth/IBluetoothGattCallback.aidl similarity index 97% rename from core/java/android/bluetooth/IBluetoothGattCallbackExt.aidl rename to core/java/android/bluetooth/IBluetoothGattCallback.aidl index ed69e54671cad..4f85cdda87f74 100644 --- a/core/java/android/bluetooth/IBluetoothGattCallbackExt.aidl +++ b/core/java/android/bluetooth/IBluetoothGattCallback.aidl @@ -22,7 +22,7 @@ import android.bluetooth.BluetoothGattService; * Callback definitions for interacting with BLE / GATT * @hide */ -oneway interface IBluetoothGattCallbackExt { +oneway interface IBluetoothGattCallback { void onClientRegistered(in int status, in int clientIf); void onClientConnectionState(in int status, in int clientIf, in boolean connected, in String address); diff --git a/core/java/android/bluetooth/IBluetoothGattServerCallbackExt.aidl b/core/java/android/bluetooth/IBluetoothGattServerCallback.aidl similarity index 97% rename from core/java/android/bluetooth/IBluetoothGattServerCallbackExt.aidl rename to core/java/android/bluetooth/IBluetoothGattServerCallback.aidl index 267e8824439da..74ee11fbd321a 100644 --- a/core/java/android/bluetooth/IBluetoothGattServerCallbackExt.aidl +++ b/core/java/android/bluetooth/IBluetoothGattServerCallback.aidl @@ -21,7 +21,7 @@ import android.bluetooth.BluetoothGattService; * Callback definitions for interacting with BLE / GATT * @hide */ -oneway interface IBluetoothGattServerCallbackExt { +oneway interface IBluetoothGattServerCallback { void onServerRegistered(in int status, in int serverIf); void onServerConnectionState(in int status, in int serverIf, in boolean connected, in String address);