bluetooth: Make in progress errors consistent across android

device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 46 matching lines @@
   // BluetoothRemoteGattCharacteristic interface:
   std::string GetIdentifier() const override;
   BluetoothUUID GetUUID() const override;
   const std::vector<uint8_t>& GetValue() const override;
   BluetoothRemoteGattService* GetService() const override;
   Properties GetProperties() const override;
   Permissions GetPermissions() const override;
   std::vector<BluetoothRemoteGattDescriptor*> GetDescriptors() const override;
   BluetoothRemoteGattDescriptor* GetDescriptor(
       const std::string& identifier) const override;
-  void ReadRemoteCharacteristic(const ValueCallback& callback,
-                                const ErrorCallback& error_callback) override;
-  void WriteRemoteCharacteristic(const std::vector<uint8_t>& value,
-                                 const base::Closure& callback,
-                                 const ErrorCallback& error_callback) override;
+  void ReadRemoteCharacteristicImpl(
+      const ValueCallback& callback,
+      const ErrorCallback& error_callback) override;
+  void WriteRemoteCharacteristicImpl(
+      const std::vector<uint8_t>& value,
+      const base::Closure& callback,
+      const ErrorCallback& error_callback) override;
 
   // Called when value changed event occurs.
   void OnChanged(JNIEnv* env,
                  const base::android::JavaParamRef<jobject>& jcaller,
                  const base::android::JavaParamRef<jbyteArray>& value);
 
   // Called when Read operation completes.
   void OnRead(JNIEnv* env,
               const base::android::JavaParamRef<jobject>& jcaller,
               int32_t status,
@@ skipping 41 matching lines @@
   BluetoothRemoteGattServiceAndroid* service_;
 
   // Java object
   // org.chromium.device.bluetooth.ChromeBluetoothRemoteGattCharacteristic.
   base::android::ScopedJavaGlobalRef<jobject> j_characteristic_;
 
   // Adapter unique instance ID.
   std::string instance_id_;
 
   // ReadRemoteCharacteristic callbacks and pending state.
-  bool read_pending_ = false;
   ValueCallback read_callback_;
   ErrorCallback read_error_callback_;
 
   // WriteRemoteCharacteristic callbacks and pending state.
-  bool write_pending_ = false;
   base::Closure write_callback_;
   ErrorCallback write_error_callback_;
 
   std::vector<uint8_t> value_;
 
   // Map of descriptors, keyed by descriptor identifier.
   std::unordered_map<std::string,
                      std::unique_ptr<BluetoothRemoteGattDescriptorAndroid>>
       descriptors_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicAndroid);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_