Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove write type from GATT descriptor writes (1/4)"

Browse Source
This commit is contained in:
Treehugger Robot
2016-08-03 23:54:35 +00:00
committed by Gerrit Code Review
parent 258a554f62 8e970d6ab4
commit b7eb1d7eaf
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,6 @@ public final class BluetoothGatt implements BluetoothProfile {
try {
mAuthRetry = true;
mService.writeDescriptor(mClientIf, address, handle,
BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT,
AUTHENTICATION_MITM, descriptor.getValue());
return;
} catch (RemoteException e) {
@@ -942,8 +941,7 @@ public final class BluetoothGatt implements BluetoothProfile {
try {
mService.writeDescriptor(mClientIf, device.getAddress(), descriptor.getInstanceId(),
BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT, AUTHENTICATION_NONE,
descriptor.getValue());
AUTHENTICATION_NONE, descriptor.getValue());
} catch (RemoteException e) {
Log.e(TAG,"",e);
mDeviceBusy = false;

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

@@ -56,7 +56,7 @@ interface IBluetoothGatt {
in int writeType, in int authReq, in byte[] value);
void readDescriptor(in int clientIf, in String address, in int handle, in int authReq);
void writeDescriptor(in int clientIf, in String address, in int handle,
in int writeType, in int authReq, in byte[] value);
in int authReq, in byte[] value);
void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable);
void beginReliableWrite(in int clientIf, in String address);
void endReliableWrite(in int clientIf, in String address, in boolean execute);