bluetooth: Make in progress errors consistent across android

device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 110 matching lines @@
 BluetoothRemoteGattDescriptor*
 BluetoothRemoteGattCharacteristicAndroid::GetDescriptor(
     const std::string& identifier) const {
   EnsureDescriptorsCreated();
   const auto& iter = descriptors_.find(identifier);
   if (iter == descriptors_.end())
     return nullptr;
   return iter->second.get();
 }
 
-void BluetoothRemoteGattCharacteristicAndroid::ReadRemoteCharacteristic(
+void BluetoothRemoteGattCharacteristicAndroid::ReadRemoteCharacteristicImpl(
     const ValueCallback& callback,
     const ErrorCallback& error_callback) {
-  if (read_pending_ || write_pending_) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(error_callback,
-                   BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
-    return;
-  }
+  DCHECK(!HasPendingGattOperation());

[scheib, 2017/04/21 23:33:11]

Drop reference to base class details and check the members of this class.
DCHECK(!read_callback_ && !read_error_callback_);

 
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_readRemoteCharacteristic(
           AttachCurrentThread(), j_characteristic_)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(error_callback,
                               BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
-  read_pending_ = true;
+  SetPendingGattOperation(true);
   read_callback_ = callback;
   read_error_callback_ = error_callback;
 }
 
-void BluetoothRemoteGattCharacteristicAndroid::WriteRemoteCharacteristic(
+void BluetoothRemoteGattCharacteristicAndroid::WriteRemoteCharacteristicImpl(
     const std::vector<uint8_t>& value,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
-  if (read_pending_ || write_pending_) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(error_callback,
-                   BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
-    return;
-  }
+  DCHECK(!HasPendingGattOperation());
 
   JNIEnv* env = AttachCurrentThread();
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_writeRemoteCharacteristic(
           env, j_characteristic_, base::android::ToJavaByteArray(env, value))) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(error_callback,
                               BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
-  write_pending_ = true;
+  SetPendingGattOperation(true);
   write_callback_ = callback;
   write_error_callback_ = error_callback;
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::OnChanged(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     const JavaParamRef<jbyteArray>& value) {
   base::android::JavaByteArrayToByteVector(env, value, &value_);
   adapter_->NotifyGattCharacteristicValueChanged(this, value_);
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::OnRead(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     int32_t status,
     const JavaParamRef<jbyteArray>& value) {
-  read_pending_ = false;
+  SetPendingGattOperation(false);
 
   // Clear callbacks before calling to avoid reentrancy issues.
   ValueCallback read_callback = read_callback_;
   ErrorCallback read_error_callback = read_error_callback_;
   read_callback_.Reset();
   read_error_callback_.Reset();
 
   if (status == 0  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
       && !read_callback.is_null()) {
     base::android::JavaByteArrayToByteVector(env, value, &value_);
     read_callback.Run(value_);
   } else if (!read_error_callback.is_null()) {
     read_error_callback.Run(
         BluetoothRemoteGattServiceAndroid::GetGattErrorCode(status));
   }
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::OnWrite(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     int32_t status) {
-  write_pending_ = false;
+  SetPendingGattOperation(false);
 
   // Clear callbacks before calling to avoid reentrancy issues.
   base::Closure write_callback = write_callback_;
   ErrorCallback write_error_callback = write_error_callback_;
   write_callback_.Reset();
   write_error_callback_.Reset();
 
   if (status == 0  // android.bluetooth.BluetoothGatt.GATT_SUCCESS
       && !write_callback.is_null()) {
     write_callback.Run();
@@ skipping 71 matching lines @@
 void BluetoothRemoteGattCharacteristicAndroid::EnsureDescriptorsCreated()
     const {
   if (!descriptors_.empty())
     return;
 
   Java_ChromeBluetoothRemoteGattCharacteristic_createDescriptors(
       AttachCurrentThread(), j_characteristic_);
 }
 
 }  // namespace device