TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add AWDL as a new Medium type in Nearby Connections

Browse Source 
PiperOrigin-RevId: 738179116
This commit is contained in:
Guogang Li
2025-03-18 16:15:07 -07:00
committed by Copybara-Service
parent a3c7a2b0b2
commit 3b0522c97a
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/BUILD
+1
View File
@@ -342,6 +342,7 @@ cc_test(
srcs = ["offline_frames_validator_test.cc"],
deps = [
":internal",
"//connections:core_types",
"//connections/implementation/flags:connections_flags",
"//connections/implementation/proto:offline_wire_formats_cc_proto",
"//internal/flags:nearby_flags",
connections/implementation/offline_frames.cc
+20
View File
@@ -550,6 +550,10 @@ UpgradePathInfo::Medium MediumToUpgradePathInfoMedium(Medium medium) {
return UpgradePathInfo::WEB_RTC;
case Medium::WEB_RTC_NON_CELLULAR:
return UpgradePathInfo::WEB_RTC_NON_CELLULAR;
case Medium::USB:
return UpgradePathInfo::USB;
case Medium::AWDL:
return UpgradePathInfo::AWDL;
default:
return UpgradePathInfo::UNKNOWN_MEDIUM;
}
@@ -577,6 +581,10 @@ Medium UpgradePathInfoMediumToMedium(UpgradePathInfo::Medium medium) {
return Medium::WEB_RTC;
case UpgradePathInfo::WEB_RTC_NON_CELLULAR:
return Medium::WEB_RTC_NON_CELLULAR;
case UpgradePathInfo::USB:
return Medium::USB;
case UpgradePathInfo::AWDL:
return Medium::AWDL;
default:
return Medium::UNKNOWN_MEDIUM;
}
@@ -592,6 +600,8 @@ ConnectionRequestFrame::Medium MediumToConnectionRequestMedium(Medium medium) {
return ConnectionRequestFrame::WIFI_HOTSPOT;
case Medium::BLE:
return ConnectionRequestFrame::BLE;
case Medium::BLE_L2CAP:
return ConnectionRequestFrame::BLE_L2CAP;
case Medium::WIFI_LAN:
return ConnectionRequestFrame::WIFI_LAN;
case Medium::WIFI_AWARE:
@@ -604,6 +614,10 @@ ConnectionRequestFrame::Medium MediumToConnectionRequestMedium(Medium medium) {
return ConnectionRequestFrame::WEB_RTC;
case Medium::WEB_RTC_NON_CELLULAR:
return ConnectionRequestFrame::WEB_RTC_NON_CELLULAR;
case Medium::USB:
return ConnectionRequestFrame::USB;
case Medium::AWDL:
return ConnectionRequestFrame::AWDL;
default:
return ConnectionRequestFrame::UNKNOWN_MEDIUM;
}
@@ -619,6 +633,8 @@ Medium ConnectionRequestMediumToMedium(ConnectionRequestFrame::Medium medium) {
return Medium::WIFI_HOTSPOT;
case ConnectionRequestFrame::BLE:
return Medium::BLE;
case ConnectionRequestFrame::BLE_L2CAP:
return Medium::BLE_L2CAP;
case ConnectionRequestFrame::WIFI_LAN:
return Medium::WIFI_LAN;
case ConnectionRequestFrame::WIFI_AWARE:
@@ -631,6 +647,10 @@ Medium ConnectionRequestMediumToMedium(ConnectionRequestFrame::Medium medium) {
return Medium::WEB_RTC;
case ConnectionRequestFrame::WEB_RTC_NON_CELLULAR:
return Medium::WEB_RTC_NON_CELLULAR;
case ConnectionRequestFrame::USB:
return Medium::USB;
case ConnectionRequestFrame::AWDL:
return Medium::AWDL;
default:
return Medium::UNKNOWN_MEDIUM;
}
connections/implementation/offline_frames_test.cc
+9 -1
View File
@@ -23,6 +23,7 @@
#include "protobuf-matchers/protocol-buffer-matchers.h"
#include "gtest/gtest.h"
#include "absl/strings/string_view.h"
#include "connections/connection_options.h"
#include "connections/implementation/flags/nearby_connections_feature_flags.h"
#include "connections/implementation/proto/offline_wire_formats.pb.h"
#include "internal/flags/nearby_flags.h"
@@ -47,10 +48,11 @@ constexpr bool kSupports5ghz = true;
constexpr absl::string_view kBssid{"FF:FF:FF:FF:FF:FF"};
constexpr int kApFrequency = 2412;
constexpr absl::string_view kIp4Bytes = {"8xqT"};
constexpr std::array<Medium, 9> kMediums = {
constexpr std::array<Medium, 11> kMediums = {
Medium::MDNS, Medium::BLUETOOTH, Medium::WIFI_HOTSPOT,
Medium::BLE, Medium::WIFI_LAN, Medium::WIFI_AWARE,
Medium::NFC, Medium::WIFI_DIRECT, Medium::WEB_RTC,
Medium::USB, Medium::AWDL,
};
constexpr int kKeepAliveIntervalMillis = 1000;
constexpr int kKeepAliveTimeoutMillis = 5000;
@@ -117,6 +119,8 @@ TEST(OfflineFramesTest, CanGenerateLegacyConnectionRequest) {
mediums: NFC
mediums: WIFI_DIRECT
mediums: WEB_RTC
mediums: USB
mediums: AWDL
keep_alive_interval_millis: 1000
keep_alive_timeout_millis: 5000
>
@@ -166,6 +170,8 @@ TEST(OfflineFramesTest, CanGenerateConnectionsConnectionRequest) {
mediums: NFC
mediums: WIFI_DIRECT
mediums: WEB_RTC
mediums: USB
mediums: AWDL
keep_alive_interval_millis: 1000
keep_alive_timeout_millis: 5000
connections_device {
@@ -226,6 +232,8 @@ TEST(OfflineFramesTest, CanGeneratePresenceConnectionRequest) {
mediums: NFC
mediums: WIFI_DIRECT
mediums: WEB_RTC
mediums: USB
mediums: AWDL
keep_alive_interval_millis: 1000
keep_alive_timeout_millis: 5000
presence_device {