From 6dfd9fa0a51fef9a1c7b3cc861c3675e9ce523af Mon Sep 17 00:00:00 2001 From: edwinwu Date: Wed, 12 Jan 2022 02:06:53 -0800 Subject: [PATCH] Remove local_name from AdvertiseSettings. PiperOrigin-RevId: 421241012 --- cpp/cal/base/ble_types.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cpp/cal/base/ble_types.h b/cpp/cal/base/ble_types.h index 3dba08fb..f9c4ae7f 100644 --- a/cpp/cal/base/ble_types.h +++ b/cpp/cal/base/ble_types.h @@ -14,6 +14,7 @@ #ifndef CAL_BASE_TYPES_H_ #define CAL_BASE_TYPES_H_ + // TODO(hais) relocate base def class accordingly. #include @@ -48,16 +49,20 @@ enum class PowerMode { struct AdvertiseSettings { AdvertiseMode advertise_mode; - PowerMode poser_mode; + PowerMode power_mode; int timeout; bool is_connectable; - std::string local_name; }; struct BleAdvertisementData { AdvertiseSettings advertise_settings; - // service UUID to advertise bytes map - std::map service_data_map; + // service UUID to advertise bytes map:16-bit service UUID - service Data + // + // Data type value : 0x16 + // if platform can't advertise data from this key (reaonly in iOS), then (iOS) + // should advertise data via LocalName data type. It means the service_uuid + // here is useless for iOS platform. + std::map service_data_map; }; enum class ScanMode { @@ -75,4 +80,5 @@ struct ScanSettings { } // namespace cal } // namespace nearby + #endif // CAL_BASE_TYPES_H_