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

Merge "Add synchronization to all mDeviceBusy state changes." am: 744e835c40

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751221

Change-Id: I652d7bef485bca276c3315efec8f5ed647883b28
This commit is contained in:
Johanna Ye
2021-06-29 19:23:29 +00:00
committed by Automerger Merge Worker
parent 40d7e0b98c 744e835c40
commit 8e9787fdb1
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1153,7 +1153,9 @@ public final class BluetoothGatt implements BluetoothProfile {
characteristic.getInstanceId(), AUTHENTICATION_NONE);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1187,7 +1189,9 @@ public final class BluetoothGatt implements BluetoothProfile {
new ParcelUuid(uuid), startHandle, endHandle, AUTHENTICATION_NONE);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1234,7 +1238,9 @@ public final class BluetoothGatt implements BluetoothProfile {
AUTHENTICATION_NONE, characteristic.getValue());
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1276,7 +1282,9 @@ public final class BluetoothGatt implements BluetoothProfile {
descriptor.getInstanceId(), AUTHENTICATION_NONE);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1317,7 +1325,9 @@ public final class BluetoothGatt implements BluetoothProfile {
AUTHENTICATION_NONE, descriptor.getValue());
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1384,7 +1394,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mService.endReliableWrite(mClientIf, mDevice.getAddress(), true);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}