bluetooth: android: Implement characteristic GetService.

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 "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "device/bluetooth/bluetooth_gatt_notify_session_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
 #include "jni/ChromeBluetoothRemoteGattCharacteristic_jni.h"
 
 using base::android::AttachCurrentThread;
 
 namespace device {
 
 // static
 scoped_ptr<BluetoothRemoteGattCharacteristicAndroid>
 BluetoothRemoteGattCharacteristicAndroid::Create(
     BluetoothAdapterAndroid* adapter,
+    BluetoothRemoteGattServiceAndroid* service,
     const std::string& instance_id,
     jobject /* BluetoothGattCharacteristicWrapper */
     bluetooth_gatt_characteristic_wrapper,
     jobject /* ChromeBluetoothDevice */ chrome_bluetooth_device) {
   scoped_ptr<BluetoothRemoteGattCharacteristicAndroid> characteristic(
-      new BluetoothRemoteGattCharacteristicAndroid(adapter, instance_id));
+      new BluetoothRemoteGattCharacteristicAndroid(adapter, service,
+                                                   instance_id));
 
   JNIEnv* env = AttachCurrentThread();
   characteristic->j_characteristic_.Reset(
       Java_ChromeBluetoothRemoteGattCharacteristic_create(
           env, reinterpret_cast<intptr_t>(characteristic.get()),
           bluetooth_gatt_characteristic_wrapper,
           base::android::ConvertUTF8ToJavaString(env, instance_id).obj(),
           chrome_bluetooth_device));
 
   return characteristic;
@@ skipping 30 matching lines @@
   return false;
 }
 
 const std::vector<uint8_t>& BluetoothRemoteGattCharacteristicAndroid::GetValue()
     const {
   return value_;
 }
 
 BluetoothGattService* BluetoothRemoteGattCharacteristicAndroid::GetService()
     const {
-  NOTIMPLEMENTED();
-  return nullptr;
+  return service_;
 }
 
 BluetoothGattCharacteristic::Properties
 BluetoothRemoteGattCharacteristicAndroid::GetProperties() const {
   return Java_ChromeBluetoothRemoteGattCharacteristic_getProperties(
       AttachCurrentThread(), j_characteristic_.obj());
 }
 
 BluetoothGattCharacteristic::Permissions
 BluetoothRemoteGattCharacteristicAndroid::GetPermissions() const {
@@ skipping 164 matching lines @@
 
   DCHECK(!descriptors_.contains(instanceIdString));
 
   descriptors_.set(instanceIdString,
                    BluetoothRemoteGattDescriptorAndroid::Create(
                        instanceIdString, bluetooth_gatt_descriptor_wrapper,
                        chrome_bluetooth_device));
 }
 
 BluetoothRemoteGattCharacteristicAndroid::
-    BluetoothRemoteGattCharacteristicAndroid(BluetoothAdapterAndroid* adapter,
-                                             const std::string& instance_id)
-    : adapter_(adapter), instance_id_(instance_id) {}
+    BluetoothRemoteGattCharacteristicAndroid(
+        BluetoothAdapterAndroid* adapter,
+        BluetoothRemoteGattServiceAndroid* service,
+        const std::string& instance_id)
+    : adapter_(adapter), service_(service), instance_id_(instance_id) {}
 
 void BluetoothRemoteGattCharacteristicAndroid::EnsureDescriptorsCreated()
     const {
   if (!descriptors_.empty())
     return;
 
   Java_ChromeBluetoothRemoteGattCharacteristic_createDescriptors(
       AttachCurrentThread(), j_characteristic_.obj());
 }
 
 }  // namespace device