Merge branch 'master' into release

Change-Id: Ieb7f2b392864096e9cd783ab89f32442bc57abe7

cpp/core_v2/options.h

@@ -21,10 +21,22 @@ namespace location {
 namespace nearby {
 namespace connections {
 
+// Generic type: allows definition of a feature T for every Medium.
+template <typename T>
+struct MediumSelector {
+  T bluetooth;
+  T web_rtc;
+  T wifi_lan;
+};
+
+// Feature On/Off switch for mediums.
+using BooleanMediumSelector = MediumSelector<bool>;
+
 // Connection Options: used for both Advertising and Discovery.
 // All fields are mutable, to make the type copy-assignable.
 struct ConnectionOptions {
   Strategy strategy;
+  BooleanMediumSelector allowed;
   bool auto_upgrade_bandwidth;
   bool enforce_topology_constraints;
   // Verify if  ConnectionOptions is in a not-initialized (Empty) state.