Merge branch 'master' into release

cpp/platform_v2/api/ble.h

@@ -89,6 +89,7 @@ class BleMedium {
 
   // Returns true once the BLE scan has been initiated.
   virtual bool StartScanning(const std::string& service_id,
+                             const std::string& fast_advertisement_service_uuid,
                              DiscoveredPeripheralCallback callback) = 0;
 
   // Returns true once BLE scanning for service_id is well and truly stopped;

cpp/platform_v2/api/bluetooth_classic.h

@@ -150,7 +150,7 @@ class BluetoothClassicMedium {
   virtual std::unique_ptr<BluetoothServerSocket> ListenForService(
       const std::string& service_name, const std::string& service_uuid) = 0;
 
-  virtual BluetoothDevice* FindRemoteDevice(const std::string& mac_address) = 0;
+  virtual BluetoothDevice* GetRemoteDevice(const std::string& mac_address) = 0;
 };
 
 }  // namespace api

cpp/platform_v2/api/platform.h

@@ -56,7 +56,7 @@ class ImplementationPlatform {
   // - synchronization primitives:
   //   - mutex (regular, and recursive)
   //   - condition variable (must work with regular mutex only)
-  //   - Future<T> : to synchronize on Callable<T> schduled to execute.
+  //   - Future<T> : to synchronize on Callable<T> scheduled to execute.
   //   - CountDownLatch : to ensure at least N threads are waiting.
   // - file I/O
   // - Logging
@@ -72,8 +72,7 @@ class ImplementationPlatform {
   // Supports enums and integers up to 32-bit.
   // Does not use locking, if platform supports 32-bit atimics natively.
   // Does not use dynamic memory allocations in operations.
-  static std::unique_ptr<AtomicUint32>
-  CreateAtomicUint32(std::uint32_t value);
+  static std::unique_ptr<AtomicUint32> CreateAtomicUint32(std::uint32_t value);
 
   static std::unique_ptr<CountDownLatch> CreateCountDownLatch(
       std::int32_t count);