Roll forward to cl/328359974

Change-Id: If2b57ecc852aecf7dea454648f485fd7c08e72a9

cpp/core_v2/options.h

@@ -2,17 +2,64 @@
 #define CORE_V2_OPTIONS_H_
 
 #include "core_v2/strategy.h"
+#include "platform_v2/base/byte_array.h"
+#include "proto/connections_enums.pb.h"
+#include "proto/connections_enums.pb.h"
 
 namespace location {
 namespace nearby {
 namespace connections {
 
+using Medium = ::location::nearby::proto::connections::Medium;
+
 // Generic type: allows definition of a feature T for every Medium.
 template <typename T>
 struct MediumSelector {
   T bluetooth;
+  T ble;
   T web_rtc;
   T wifi_lan;
+
+  constexpr MediumSelector() = default;
+  constexpr MediumSelector(const MediumSelector&) = default;
+  constexpr MediumSelector& operator=(const MediumSelector&) = default;
+
+  constexpr bool Any(T value) const {
+    return bluetooth == value || ble == value || web_rtc == value ||
+           wifi_lan == value;
+  }
+
+  constexpr bool All(T value) const {
+    return bluetooth == value && ble == value && web_rtc == value &&
+           wifi_lan == value;
+  }
+
+  constexpr int Count(T value) const {
+    int count = 0;
+    if (bluetooth == value) count++;
+    if (ble == value) count++;
+    if (wifi_lan == value) count++;
+    if (web_rtc == value) count++;
+    return count;
+  }
+
+  constexpr MediumSelector& SetAll(T value) {
+    bluetooth = value;
+    ble = value;
+    web_rtc = value;
+    wifi_lan = value;
+    return *this;
+  }
+
+  std::vector<Medium> GetMediums(T value) const {
+    std::vector<Medium> mediums;
+    // Mediums are sorted in order of decreasing preference.
+    if (wifi_lan == value) mediums.push_back(Medium::WIFI_LAN);
+    if (web_rtc == value) mediums.push_back(Medium::WEB_RTC);
+    if (ble == value) mediums.push_back(Medium::BLE);
+    if (bluetooth == value) mediums.push_back(Medium::BLUETOOTH);
+    return mediums;
+  }
 };
 
 // Feature On/Off switch for mediums.
@@ -22,17 +69,23 @@ using BooleanMediumSelector = MediumSelector<bool>;
 // All fields are mutable, to make the type copy-assignable.
 struct ConnectionOptions {
   Strategy strategy;
-  BooleanMediumSelector allowed;
+  BooleanMediumSelector allowed{BooleanMediumSelector().SetAll(true)};
   bool auto_upgrade_bandwidth;
   bool enforce_topology_constraints;
+  ByteArray remote_bluetooth_mac_address;
   // Verify if  ConnectionOptions is in a not-initialized (Empty) state.
-  bool Empty() const {
-    return strategy.IsNone();
-  }
+  bool Empty() const { return strategy.IsNone(); }
   // Bring  ConnectionOptions to a not-initialized (Empty) state.
-  void Clear() {
-    strategy.Clear();
+  void Clear() { strategy.Clear(); }
+  // Returns a copy, but if no mediums are allowed, allowes all mediums.
+  ConnectionOptions CompatibleOptions() const {
+    ConnectionOptions result = *this;
+    if (!allowed.Any(true)) {
+      result.allowed.SetAll(true);
+    }
+    return result;
   }
+  std::vector<Medium> GetMediums() const { return allowed.GetMediums(true); }
 };
 
 }  // namespace connections