bluetooth: Replace old advertised uuids

device/bluetooth/bluetooth_device_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_device_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 33 matching lines @@
       bluetooth_device_wrapper));
 
   return device;
 }
 
 BluetoothDeviceAndroid::~BluetoothDeviceAndroid() {
   Java_ChromeBluetoothDevice_onBluetoothDeviceAndroidDestruction(
       AttachCurrentThread(), j_device_.obj());
 }
 
-bool BluetoothDeviceAndroid::UpdateAdvertisedUUIDs(jobject advertised_uuids) {
-  return Java_ChromeBluetoothDevice_updateAdvertisedUUIDs(
-      AttachCurrentThread(), j_device_.obj(), advertised_uuids);
+void BluetoothDeviceAndroid::UpdateAdvertisedUUIDs(
+    jobjectArray advertised_uuids) {
+  JNIEnv* env = AttachCurrentThread();
+  std::vector<std::string> uuid_strings;
+  AppendJavaStringArrayToStringVector(env, advertised_uuids, &uuid_strings);
+
+  advertised_uuids_ = UUIDList(uuid_strings.begin(), uuid_strings.end());
 }
 
 // static
 bool BluetoothDeviceAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(env);  // Generated in ChromeBluetoothDevice_jni.h
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 BluetoothDeviceAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(j_device_);
@@ skipping 61 matching lines @@
 bool BluetoothDeviceAndroid::IsConnectable() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool BluetoothDeviceAndroid::IsConnecting() const {
   NOTIMPLEMENTED();
   return false;
 }
 
-BluetoothDevice::UUIDList BluetoothDeviceAndroid::GetUUIDs() const {
-  JNIEnv* env = AttachCurrentThread();
-  std::vector<std::string> uuid_strings;
-  AppendJavaStringArrayToStringVector(
-      env, Java_ChromeBluetoothDevice_getUuids(env, j_device_.obj()).obj(),
-      &uuid_strings);
-  BluetoothDevice::UUIDList uuids;
-  uuids.reserve(uuid_strings.size());
-  for (auto uuid_string : uuid_strings) {
-    uuids.push_back(BluetoothUUID(uuid_string));
-  }
-  return uuids;
-}
-
 int16_t BluetoothDeviceAndroid::GetInquiryRSSI() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
 
 int16_t BluetoothDeviceAndroid::GetInquiryTxPower() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
 
@@ skipping 83 matching lines @@
     // We assume that if there are any pending connection callbacks there
     // was a failed connection attempt.
     RecordConnectionFailureResult(status);
     // TODO(ortuno): Return an error code based on |status|
     // http://crbug.com/578191
     DidFailToConnectGatt(ERROR_FAILED);
   } else {
     // Otherwise an existing connection was terminated.
     RecordConnectionTerminatedResult(status);
     gatt_services_.clear();
+    service_uuids_.clear();
     SetGattServicesDiscoveryComplete(false);
     DidDisconnectGatt();
   }
 }
 
 void BluetoothDeviceAndroid::OnGattServicesDiscovered(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller) {
+  UpdateServiceUUIDs();
   SetGattServicesDiscoveryComplete(true);
   adapter_->NotifyGattServicesDiscovered(this);
 }
 
 void BluetoothDeviceAndroid::CreateGattRemoteService(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jstring>& instance_id,
     const JavaParamRef<jobject>&
         bluetooth_gatt_service_wrapper) {  // BluetoothGattServiceWrapper
@@ skipping 21 matching lines @@
       AttachCurrentThread(), j_device_.obj(),
       base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(),
                                             j_device_.obj());
 }
 
 }  // namespace device