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 
am: b7eb1d7eaf

Change-Id: Ibe16bab7ec21d19d6f3cfd5cb65768b06a5ca829
This commit is contained in:
Jakub Pawlowski
2016-08-04 00:01:25 +00:00
committed by android-build-merger
parent 2dc1fe659a b7eb1d7eaf
commit 0aa5797976
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 { try {
mAuthRetry = true; mAuthRetry = true;
mService.writeDescriptor(mClientIf, address, handle, mService.writeDescriptor(mClientIf, address, handle,
BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT,
AUTHENTICATION_MITM, descriptor.getValue()); AUTHENTICATION_MITM, descriptor.getValue());
return; return;
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -942,8 +941,7 @@ public final class BluetoothGatt implements BluetoothProfile {
try { try {
mService.writeDescriptor(mClientIf, device.getAddress(), descriptor.getInstanceId(), mService.writeDescriptor(mClientIf, device.getAddress(), descriptor.getInstanceId(),
BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT, AUTHENTICATION_NONE, AUTHENTICATION_NONE, descriptor.getValue());
descriptor.getValue());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG,"",e); Log.e(TAG,"",e);
mDeviceBusy = false; mDeviceBusy = false;

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

@@ -57,7 +57,7 @@ interface IBluetoothGatt {
in int writeType, in int authReq, in byte[] value); in int writeType, in int authReq, in byte[] value);
void readDescriptor(in int clientIf, in String address, in int handle, in int authReq); 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, 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 registerForNotification(in int clientIf, in String address, in int handle, in boolean enable);
void beginReliableWrite(in int clientIf, in String address); void beginReliableWrite(in int clientIf, in String address);
void endReliableWrite(in int clientIf, in String address, in boolean execute); void endReliableWrite(in int clientIf, in String address, in boolean execute);