bluetooth: Make in progress errors consistent across android

device/bluetooth/bluetooth_device.cc

 // Copyright (c) 2012 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_device.h"
 
 #include <iterator>
 #include <memory>
 #include <string>
 
@@ skipping 56 matching lines @@
 void BluetoothDevice::DeviceUUIDs::UpdateDeviceUUIDs() {
   device_uuids_.clear();
   std::set_union(advertised_uuids_.begin(), advertised_uuids_.end(),
                  service_uuids_.begin(), service_uuids_.end(),
                  std::inserter(device_uuids_, device_uuids_.begin()));
 }
 
 BluetoothDevice::BluetoothDevice(BluetoothAdapter* adapter)
     : adapter_(adapter),
       gatt_services_discovery_complete_(false),
+      pending_gatt_operation_(false),
       last_update_time_(base::Time()) {}
 
 BluetoothDevice::~BluetoothDevice() {
   for (BluetoothGattConnection* connection : gatt_connections_) {
     connection->InvalidateConnectionReference();
   }
 }
 
 BluetoothDevice::ConnectionInfo::ConnectionInfo()
     : rssi(kUnknownPower),
@@ skipping 422 matching lines @@
 }
 
 void BluetoothDevice::RemoveGattConnection(
     BluetoothGattConnection* connection) {
   size_t erased_count = gatt_connections_.erase(connection);
   DCHECK(erased_count);
   if (gatt_connections_.size() == 0)
     DisconnectGatt();
 }
 
+bool BluetoothDevice::HasPendingGattOperation() const {
+  return pending_gatt_operation_;
+}
+
+void BluetoothDevice::SetPendingGattOperation(bool pending) {
+  pending_gatt_operation_ = pending;
+}
+
 void BluetoothDevice::SetAsExpiredForTesting() {
   last_update_time_ =
       base::Time::NowFromSystemTime() -
       (BluetoothAdapter::timeoutSec + base::TimeDelta::FromSeconds(1));
 }
 
 void BluetoothDevice::Pair(PairingDelegate* pairing_delegate,
                            const base::Closure& callback,
                            const ConnectErrorCallback& error_callback) {
   NOTREACHED();
@@ skipping 12 matching lines @@
   if (power < INT8_MIN) {
     return INT8_MIN;
   }
   if (power > INT8_MAX) {
     return INT8_MAX;
   }
   return static_cast<int8_t>(power);
 }
 
 }  // namespace device