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 am: 8e9787fdb1 am: 7bd3fa33dc

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

Change-Id: Ie7fe3c1f90149a818ca14711cf6128b4e08dbcdb
This commit is contained in:
Johanna Ye
2021-06-29 20:03:43 +00:00
committed by Automerger Merge Worker
parent 0206066352 7bd3fa33dc
commit 2ca11a0ebe
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

@@ -1190,7 +1190,9 @@ public final class BluetoothGatt implements BluetoothProfile {
characteristic.getInstanceId(), AUTHENTICATION_NONE, mAttributionSource);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1226,7 +1228,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mAttributionSource);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1274,7 +1278,9 @@ public final class BluetoothGatt implements BluetoothProfile {
AUTHENTICATION_NONE, characteristic.getValue(), mAttributionSource);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1317,7 +1323,9 @@ public final class BluetoothGatt implements BluetoothProfile {
descriptor.getInstanceId(), AUTHENTICATION_NONE, mAttributionSource);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1359,7 +1367,9 @@ public final class BluetoothGatt implements BluetoothProfile {
AUTHENTICATION_NONE, descriptor.getValue(), mAttributionSource);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}
@@ -1428,7 +1438,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mService.endReliableWrite(mClientIf, mDevice.getAddress(), true, mAttributionSource);
} catch (RemoteException e) {
Log.e(TAG, "", e);
mDeviceBusy = false;
synchronized (mDeviceBusyLock) {
mDeviceBusy = false;
}
return false;
}