Roll forward to cl/338482889

Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I9850950db8bd84f0904ea1a413151887f52098cf

cpp/platform/api/bluetooth_adapter.h

@@ -1,57 +1,60 @@
 #ifndef PLATFORM_API_BLUETOOTH_ADAPTER_H_
 #define PLATFORM_API_BLUETOOTH_ADAPTER_H_
 
-#include "platform/port/string.h"
-#include "platform/ptr.h"
+#include <string>
+
+#include "absl/strings/string_view.h"
 
 namespace location {
 namespace nearby {
+namespace api {
 
 // https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html
 class BluetoothAdapter {
  public:
-  virtual ~BluetoothAdapter() {}
+  virtual ~BluetoothAdapter() = default;
 
   // Eligible statuses of the BluetoothAdapter.
-  struct Status {
-    enum Value {
-      DISABLED,
-      ENABLED,
-    };
+  enum class Status {
+    kDisabled,
+    kEnabled,
   };
 
   // Synchronously sets the status of the BluetoothAdapter to 'status', and
   // returns true if the operation was a success.
-  virtual bool setStatus(Status::Value status) = 0;
+  virtual bool SetStatus(Status status) = 0;
   // Returns true if the BluetoothAdapter's current status is
-  // Status::Value::ENABLED.
-  virtual bool isEnabled() = 0;
+  // Status::Value::kEnabled.
+  virtual bool IsEnabled() const = 0;
 
   // Scan modes of a BluetoothAdapter, as described at
   // https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getScanMode().
-  struct ScanMode {
-    enum Value {
-      UNKNOWN,
-      CONNECTABLE_DISCOVERABLE,
-    };
+  enum class ScanMode {
+    kUnknown,
+    kNone,
+    kConnectable,
+    kConnectableDiscoverable,
   };
 
   // https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getScanMode()
   //
-  // Returns ScanMode::UNKNOWN on error.
-  virtual ScanMode::Value getScanMode() = 0;
+  // Returns ScanMode::kUnknown on error.
+  virtual ScanMode GetScanMode() const = 0;
   // Synchronously sets the scan mode of the adapter, and returns true if the
   // operation was a success.
-  virtual bool setScanMode(ScanMode::Value scan_mode) = 0;
+  virtual bool SetScanMode(ScanMode scan_mode) = 0;
 
   // https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getName()
-  //
-  // Returns a null Ptr<string> on error.
-  virtual Ptr<std::string> getName() = 0;
+  // Returns an empty string on error
+  virtual std::string GetName() const = 0;
   // https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#setName(java.lang.String)
-  virtual bool setName(const std::string& name) = 0;
+  virtual bool SetName(absl::string_view name) = 0;
+
+  // Returns BT MAC address assigned to this adapter.
+  virtual std::string GetMacAddress() const = 0;
 };
 
+}  // namespace api
 }  // namespace nearby
 }  // namespace location