Add implementation for parsing device info in read/write attribute calls.

device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc

 // Copyright 2016 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/dbus/bluetooth_gatt_characteristic_service_provider_impl.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "device/bluetooth/dbus/bluetooth_gatt_attribute_helpers.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace bluez {
 
 namespace {
 
 const char kErrorInvalidArgs[] = "org.freedesktop.DBus.Error.InvalidArgs";
 const char kErrorPropertyReadOnly[] =
     "org.freedesktop.DBus.Error.PropertyReadOnly";
 const char kErrorFailed[] = "org.freedesktop.DBus.Error.Failed";
@@ skipping 235 matching lines @@
   WriteProperties(&writer);
   response_sender.Run(std::move(response));
 }
 
 void BluetoothGattCharacteristicServiceProviderImpl::ReadValue(
     dbus::MethodCall* method_call,
     dbus::ExportedObject::ResponseSender response_sender) {
   VLOG(3) << "BluetoothGattCharacteristicServiceProvider::ReadValue: "
           << object_path_.value();
   DCHECK(OnOriginThread());
+
+  dbus::MessageReader reader(method_call);
+  dbus::ObjectPath device_path = ReadDevicePath(&reader);
+  if (device_path.value().empty()) {
+    LOG(WARNING) << "ReadValue called with incorrect parameters: "
+                 << method_call->ToString();
+    // Continue on with an empty device path. This will return a null device to
+    // the delegate, which should know how to handle it.
+  }
+
   DCHECK(delegate_);
   delegate_->GetValue(
-      dbus::ObjectPath(),
+      device_path,
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnReadValue,
                  weak_ptr_factory_.GetWeakPtr(), method_call, response_sender),
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnFailure,
                  weak_ptr_factory_.GetWeakPtr(), method_call, response_sender));
 }
 
 void BluetoothGattCharacteristicServiceProviderImpl::WriteValue(
     dbus::MethodCall* method_call,
     dbus::ExportedObject::ResponseSender response_sender) {
   VLOG(3) << "BluetoothGattCharacteristicServiceProvider::WriteValue: "
           << object_path_.value();
   DCHECK(OnOriginThread());
 
   dbus::MessageReader reader(method_call);
   const uint8_t* bytes = NULL;
   size_t length = 0;
 
-  if (!reader.PopArrayOfBytes(&bytes, &length))
-    VLOG(2) << "Error reading array of bytes in in WriteValue";
   std::vector<uint8_t> value;
+  if (!reader.PopArrayOfBytes(&bytes, &length)) {
+    LOG(WARNING) << "Error reading value parameter. WriteValue called with "
+                    "incorrect parameters: "
+                 << method_call->ToString();
+  }
   if (bytes)
     value.assign(bytes, bytes + length);
 
+  dbus::ObjectPath device_path = ReadDevicePath(&reader);
+  if (device_path.value().empty()) {
+    LOG(WARNING) << "WriteValue called with incorrect parameters: "
+                 << method_call->ToString();
+    // Continue on with an empty device path. This will return a null device to
+    // the delegate, which should know how to handle it.
+  }
+
   DCHECK(delegate_);
   delegate_->SetValue(
-      dbus::ObjectPath(), value,
+      device_path, value,
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnWriteValue,
                  weak_ptr_factory_.GetWeakPtr(), method_call, response_sender),
       base::Bind(&BluetoothGattCharacteristicServiceProviderImpl::OnFailure,
                  weak_ptr_factory_.GetWeakPtr(), method_call, response_sender));
 }
 
 void BluetoothGattCharacteristicServiceProviderImpl::StartNotify(
     dbus::MethodCall* method_call,
     dbus::ExportedObject::ResponseSender response_sender) {
   VLOG(3) << "BluetoothGattCharacteristicServiceProvider::StartNotify: "
@@ skipping 87 matching lines @@
           method_call, kErrorFailed, "Failed to get/set characteristic value.");
   response_sender.Run(std::move(error_response));
 }
 
 const dbus::ObjectPath&
 BluetoothGattCharacteristicServiceProviderImpl::object_path() const {
   return object_path_;
 }
 
 }  // namespace bluez