Merge branch 'master' into release

cpp/core_v2/internal/mediums/ble.cc

@@ -120,6 +120,7 @@ bool Ble::IsAdvertisingLocked(const std::string& service_id) {
 }
 
 bool Ble::StartScanning(const std::string& service_id,
+                        const std::string& fast_advertisement_service_uuid,
                         DiscoveredPeripheralCallback callback) {
   MutexLock lock(&mutex_);
 
@@ -147,7 +148,8 @@ bool Ble::StartScanning(const std::string& service_id,
     return false;
   }
 
-  if (!medium_.StartScanning(service_id, callback)) {
+  if (!medium_.StartScanning(service_id, fast_advertisement_service_uuid,
+                             callback)) {
     NEARBY_LOGS(INFO) << "Failed to start scan of BLE services.";
     return false;
   }

cpp/core_v2/internal/mediums/ble.h

@@ -59,6 +59,7 @@ class Ble {
   // range through a callback. Returns true, if scanning mode was enabled,
   // false otherwise.
   bool StartScanning(const std::string& service_id,
+                     const std::string& fast_advertisement_service_uuid,
                      DiscoveredPeripheralCallback callback)
       ABSL_LOCKS_EXCLUDED(mutex_);
 

cpp/core_v2/internal/mediums/ble_test.cc

@@ -32,7 +32,7 @@ namespace {
 constexpr absl::Duration kWaitDuration = absl::Milliseconds(1000);
 constexpr absl::string_view kServiceID{"com.google.location.nearby.apps.test"};
 constexpr absl::string_view kAdvertisementString{"\x0a\x0b\x0c\x0d"};
-constexpr absl::string_view kFastAdvertisementServiceUuid{"\xff\xfe"};
+constexpr absl::string_view kFastAdvertisementServiceUuid{"\xf3\xfe"};
 
 class BleTest : public ::testing::Test {
  protected:
@@ -75,6 +75,7 @@ TEST_F(BleTest, CanStartAdvertising) {
 
   ble_b.StartScanning(
       service_id,
+      fast_advertisement_service_uuid,
       DiscoveredPeripheralCallback{
           .peripheral_discovered_cb =
               [&found_latch](
@@ -109,6 +110,7 @@ TEST_F(BleTest, CanStartDiscovery) {
 
   EXPECT_TRUE(ble_a.StartScanning(
       service_id,
+      fast_advertisement_service_uuid,
       DiscoveredPeripheralCallback{
           .peripheral_discovered_cb =
               [&accept_latch](
@@ -153,6 +155,7 @@ TEST_F(BleTest, CanStartAcceptingConnectionsAndConnect) {
   BlePeripheral discovered_peripheral;
   ble_b.StartScanning(
       service_id,
+      fast_advertisement_service_uuid,
       {
           .peripheral_discovered_cb =
               [&found_latch, &discovered_peripheral](

cpp/core_v2/internal/mediums/bluetooth_classic.cc

@@ -382,10 +382,10 @@ BluetoothSocket BluetoothClassic::Connect(BluetoothDevice& bluetooth_device,
   return socket;
 }
 
-BluetoothDevice BluetoothClassic::FindRemoteDevice(
+BluetoothDevice BluetoothClassic::GetRemoteDevice(
     const std::string& mac_address) {
   MutexLock lock(&mutex_);
-  return medium_.FindRemoteDevice(mac_address);
+  return medium_.GetRemoteDevice(mac_address);
 }
 
 std::string BluetoothClassic::GetMacAddress() const {

cpp/core_v2/internal/mediums/bluetooth_classic.h

@@ -116,7 +116,7 @@ class BluetoothClassic {
 
   std::string GetMacAddress() const ABSL_LOCKS_EXCLUDED(mutex_);
 
-  BluetoothDevice FindRemoteDevice(const std::string& mac_address)
+  BluetoothDevice GetRemoteDevice(const std::string& mac_address)
       ABSL_LOCKS_EXCLUDED(mutex_);
 
  private:

cpp/core_v2/internal/mediums/webrtc/connection_flow.cc

@@ -247,8 +247,8 @@ bool ConnectionFlow::InitPeerConnection(WebRtcMedium& webrtc_medium) {
   Future<bool> success_future;
   webrtc_medium.CreatePeerConnection(
       &peer_connection_observer_,
-      [this, &success_future](
-          rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection) {
+      [this, success_future](rtc::scoped_refptr<webrtc::PeerConnectionInterface>
+                                 peer_connection) mutable {
         if (!peer_connection) {
           success_future.Set(false);
           return;
@@ -343,8 +343,7 @@ bool ConnectionFlow::CloseLocked() {
   state_ = State::kEnded;
 
   data_channel_future_.SetException({Exception::kInterrupted});
-  if (peer_connection_)
-    peer_connection_->Close();
+  if (peer_connection_) peer_connection_->Close();
 
   data_channel_observer_.reset();
   NEARBY_LOG(INFO, "Closed WebRTC connection.");