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

Merge "Always use Write Request for GATT descriptor writes"

Browse Source 
am: 2358043

* commit '235804398300e46baf5ebf14bb5c36badf8dd286':
  Always use Write Request for GATT descriptor writes

Change-Id: Ifb3a81c527cf21fc90a6cd77901eae85f29ab0cc
This commit is contained in:
Andre Eisenbach
2016-04-01 00:28:20 +00:00
committed by android-build-merger
parent ddae22044d 2358043983
commit 984df4ed93
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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