drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: beb8ceada8

Change-Id: Ie88e330a1d50adac8c6b83581079c6096c4d898a
This commit is contained in:
Jakub Pawlowski
2017-03-27 21:22:15 +00:00
committed by android-build-merger
parent 3f26682252 beb8ceada8
commit cfe099b01d
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@ -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 \

4
core/java/android/bluetooth/BluetoothGatt.java
View File

@ -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

4
core/java/android/bluetooth/BluetoothGattServer.java
View File

@ -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

8
core/java/android/bluetooth/IBluetoothGatt.aidl
View File

@ -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);

2
core/java/android/bluetooth/IBluetoothGattCallbackExt.aidl → core/java/android/bluetooth/IBluetoothGattCallback.aidl
View File

@ -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);

2
core/java/android/bluetooth/IBluetoothGattServerCallbackExt.aidl → core/java/android/bluetooth/IBluetoothGattServerCallback.aidl
View File

@ -21,7 +21,7 @@ import android.bluetooth.BluetoothGattService;
* Callback definitions for interacting with BLE / GATT * Callback definitions for interacting with BLE / GATT
* @hide * @hide
*/ */
oneway interface IBluetoothGattServerCallbackExt { oneway interface IBluetoothGattServerCallback {
void onServerRegistered(in int status, in int serverIf); void onServerRegistered(in int status, in int serverIf);
void onServerConnectionState(in int status, in int serverIf, void onServerConnectionState(in int status, in int serverIf,
in boolean connected, in String address); in boolean connected, in String address);