Merge "Synchronize on a static final object to lock mDeviceBusy" am: 34f9a3e9e9 am: 56d37b7c43 (a42f0589) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothGatt.java

+13 −12

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		private int mAuthRetryState;
		private int mConnState;
		private final Object mStateLock = new Object();
		private final Object mDeviceBusyLock = new Object();
		@UnsupportedAppUsage
		private Boolean mDeviceBusy = false;
		@UnsupportedAppUsage
		@@ -282,7 +283,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		}
		}

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		mDeviceBusy = false;
		}
		}
		@@ -357,7 +358,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		return;
		}

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		mDeviceBusy = false;
		}

		@@ -413,7 +414,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		return;
		}

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		mDeviceBusy = false;
		}

		@@ -496,7 +497,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		return;
		}

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		mDeviceBusy = false;
		}

		@@ -547,7 +548,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		return;
		}

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		mDeviceBusy = false;
		}

		@@ -596,7 +597,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		return;
		}

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		mDeviceBusy = false;
		}

		@@ -1098,7 +1099,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		BluetoothDevice device = service.getDevice();
		if (device == null) return false;

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		if (mDeviceBusy) return false;
		mDeviceBusy = true;
		}
		@@ -1132,7 +1133,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		if (VDBG) Log.d(TAG, "readUsingCharacteristicUuid() - uuid: " + uuid);
		if (mService == null \|\| mClientIf == 0) return false;

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		if (mDeviceBusy) return false;
		mDeviceBusy = true;
		}
		@@ -1178,7 +1179,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		BluetoothDevice device = service.getDevice();
		if (device == null) return false;

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		if (mDeviceBusy) return false;
		mDeviceBusy = true;
		}
		@@ -1221,7 +1222,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		BluetoothDevice device = service.getDevice();
		if (device == null) return false;

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		if (mDeviceBusy) return false;
		mDeviceBusy = true;
		}
		@@ -1262,7 +1263,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		BluetoothDevice device = service.getDevice();
		if (device == null) return false;

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		if (mDeviceBusy) return false;
		mDeviceBusy = true;
		}
		@@ -1330,7 +1331,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		if (VDBG) Log.d(TAG, "executeReliableWrite() - device: " + mDevice.getAddress());
		if (mService == null \|\| mClientIf == 0) return false;

		synchronized (mDeviceBusy) {
		synchronized (mDeviceBusyLock) {
		if (mDeviceBusy) return false;
		mDeviceBusy = true;
		}