device/bluetooth: Update GATT descriptor value D-Bus bindings.

chromeos/dbus/fake_bluetooth_gatt_descriptor_client.cc

 // Copyright 2014 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 "chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ skipping 24 matching lines @@
 }
 
 void FakeBluetoothGattDescriptorClient::Properties::GetAll() {
   VLOG(1) << "GetAll";
 }
 
 void FakeBluetoothGattDescriptorClient::Properties::Set(
     dbus::PropertyBase* property,
     dbus::PropertySet::SetCallback callback) {
   VLOG(1) << "Set " << property->name();
-  if (property->name() != value.name()) {
-    callback.Run(false);
-    return;
-  }
-
-  // TODO(armansito): Setting the "Value" property should be allowed based
-  // on permissions.
-  if (uuid.value() != kClientCharacteristicConfigurationUUID) {
-    callback.Run(false);
-    return;
-  }
-  callback.Run(true);
-  property->ReplaceValueWithSetValue();
+  callback.Run(false);
 }
 
 FakeBluetoothGattDescriptorClient::FakeBluetoothGattDescriptorClient()
     : weak_ptr_factory_(this) {
 }
 
 FakeBluetoothGattDescriptorClient::~FakeBluetoothGattDescriptorClient() {
 }
 
 void FakeBluetoothGattDescriptorClient::Init(dbus::Bus* bus) {
@@ skipping 16 matching lines @@
   }
   return descriptors;
 }
 
 FakeBluetoothGattDescriptorClient::Properties*
 FakeBluetoothGattDescriptorClient::GetProperties(
     const dbus::ObjectPath& object_path) {
   PropertiesMap::const_iterator iter = properties_.find(object_path);
   if (iter == properties_.end())
     return NULL;
-  return iter->second;
+  return iter->second->properties.get();
+}
+
+void FakeBluetoothGattDescriptorClient::ReadValue(
+    const dbus::ObjectPath& object_path,
+    const ValueCallback& callback,
+    const ErrorCallback& error_callback) {
+  PropertiesMap::iterator iter = properties_.find(object_path);
+  if (iter == properties_.end()) {
+    error_callback.Run(kUnknownDescriptorError, "");
+    return;
+  }
+
+  callback.Run(iter->second->value);
+}
+
+void FakeBluetoothGattDescriptorClient::WriteValue(
+    const dbus::ObjectPath& object_path,
+    const std::vector<uint8>& value,
+    const base::Closure& callback,
+    const ErrorCallback& error_callback) {
+  if (properties_.find(object_path) == properties_.end()) {
+    error_callback.Run(kUnknownDescriptorError, "");
+    return;
+  }
+
+  // Since the only fake descriptor is "Client Characteristic Configuration"
+  // and BlueZ doesn't allow writing to it, return failure.
+  error_callback.Run("org.bluez.Error.Failed",
+                     "Writing to the Client Characteristic Configuration "
+                     "descriptor not allowed");
 }
 
 dbus::ObjectPath FakeBluetoothGattDescriptorClient::ExposeDescriptor(
     const dbus::ObjectPath& characteristic_path,
     const std::string& uuid) {
   if (uuid != kClientCharacteristicConfigurationUUID) {
     VLOG(2) << "Unsupported UUID: " << uuid;
     return dbus::ObjectPath();
   }
 
   // CCC descriptor is the only one supported at the moment.
   DCHECK(characteristic_path.IsValid());
   dbus::ObjectPath object_path(
       characteristic_path.value() + "/" +
       kClientCharacteristicConfigurationPathComponent);
   DCHECK(object_path.IsValid());
   PropertiesMap::const_iterator iter = properties_.find(object_path);
   if (iter != properties_.end()) {
     VLOG(1) << "Descriptor already exposed: " << object_path.value();
     return dbus::ObjectPath();
   }
 
   Properties* properties = new Properties(base::Bind(
       &FakeBluetoothGattDescriptorClient::OnPropertyChanged,
       weak_ptr_factory_.GetWeakPtr(),
       object_path));
-  properties_[object_path] = properties;
   properties->uuid.ReplaceValue(uuid);
   properties->characteristic.ReplaceValue(characteristic_path);
 
-  std::vector<uint8> value;
-  value.push_back(0);  // Notifications/Indications disabled.
-  value.push_back(0);
-  properties->value.ReplaceValue(value);
+  DescriptorData* data = new DescriptorData();
+  data->properties.reset(properties);
+
+  data->value.push_back(1);  // Notifications enabled.
+  data->value.push_back(0);
+
+  properties_[object_path] = data;
 
   NotifyDescriptorAdded(object_path);
 
   return object_path;
 }
 
 void FakeBluetoothGattDescriptorClient::HideDescriptor(
     const dbus::ObjectPath& descriptor_path) {
   PropertiesMap::iterator iter = properties_.find(descriptor_path);
   if (iter == properties_.end()) {
     VLOG(1) << "Descriptor not exposed: " << descriptor_path.value();
     return;
   }
 
   NotifyDescriptorRemoved(descriptor_path);
 
   delete iter->second;
   properties_.erase(iter);
 }
 
 void FakeBluetoothGattDescriptorClient::OnPropertyChanged(
     const dbus::ObjectPath& object_path,
     const std::string& property_name) {
   VLOG(2) << "Descriptor property changed: " << object_path.value()
           << ": " << property_name;
 
   FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_,
                     GattDescriptorPropertyChanged(object_path, property_name));
-
-  // TODO(armansito): Implement CCC behavior (enable/disable notifications
-  // or indications characteristics).
 }
 
 void FakeBluetoothGattDescriptorClient::NotifyDescriptorAdded(
     const dbus::ObjectPath& object_path) {
   FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_,
                     GattDescriptorAdded(object_path));
 }
 
 void FakeBluetoothGattDescriptorClient::NotifyDescriptorRemoved(
     const dbus::ObjectPath& object_path) {
   FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_,
                     GattDescriptorRemoved(object_path));
 }
 
 }  // namespace chromeos