Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev (d9ad6fc1) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothGatt.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -350,12 +350,11 @@ public final class BluetoothGatt implements BluetoothProfile {
		return;
		}

		if (status == 0) characteristic.setValue(value);

		runOrQueueCallback(new Runnable() {
		@Override
		public void run() {
		if (mCallback != null) {
		if (status == 0) characteristic.setValue(value);
		mCallback.onCharacteristicRead(BluetoothGatt.this, characteristic,
		status);
		}
		@@ -428,12 +427,11 @@ public final class BluetoothGatt implements BluetoothProfile {
		BluetoothGattCharacteristic characteristic = getCharacteristicById(mDevice, handle);
		if (characteristic == null) return;

		characteristic.setValue(value);

		runOrQueueCallback(new Runnable() {
		@Override
		public void run() {
		if (mCallback != null) {
		characteristic.setValue(value);
		mCallback.onCharacteristicChanged(BluetoothGatt.this, characteristic);
		}
		}
		@@ -459,7 +457,6 @@ public final class BluetoothGatt implements BluetoothProfile {
		BluetoothGattDescriptor descriptor = getDescriptorById(mDevice, handle);
		if (descriptor == null) return;

		if (status == 0) descriptor.setValue(value);

		if ((status == GATT_INSUFFICIENT_AUTHENTICATION
		\|\| status == GATT_INSUFFICIENT_ENCRYPTION)
		@@ -481,6 +478,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		@Override
		public void run() {
		if (mCallback != null) {
		if (status == 0) descriptor.setValue(value);
		mCallback.onDescriptorRead(BluetoothGatt.this, descriptor, status);
		}
		}