Roll forward to cl/341150519

Signed-off-by: hai007 <hais@google.com>
This commit is contained in:
hai007
2020-11-06 18:02:01 -08:00
parent 67f5942051
commit bad8738eb6
2 changed files with 3 additions and 2 deletions
@@ -21,6 +21,7 @@ using WifiAwareCredentials = UpgradePathInfo::WifiAwareCredentials;
using WifiDirectCredentials = UpgradePathInfo::WifiDirectCredentials;
using BluetoothCredentials = UpgradePathInfo::BluetoothCredentials;
using WebRtcCredentials = UpgradePathInfo::WebRtcCredentials;
using Medium = location::nearby::connections::Medium;
constexpr absl::string_view kIpv4PatternString{
"^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
@@ -225,7 +226,7 @@ Exception EnsureValidBandwidthUpgradePathAvailableFrame(
const UpgradePathInfo& upgrade_path_info) {
if (!upgrade_path_info.has_medium())
return {Exception::kInvalidProtocolBuffer};
switch (upgrade_path_info.medium()) {
switch (static_cast<Medium>(upgrade_path_info.medium())) {
case Medium::WIFI_HOTSPOT:
if (upgrade_path_info.has_wifi_hotspot_credentials()) {
return EnsureValidBandwidthUpgradeWifiHotspotPathAvailableFrame(
+1 -1
View File
@@ -96,7 +96,7 @@ WifiLanBwuHandler::CreateUpgradedEndpointChannel(
}
const std::string& ip_address = wifi_lan_socket.ip_address();
int32 port = wifi_lan_socket.wifi_port();
std::int32_t port = wifi_lan_socket.wifi_port();
WifiLanService wifi_lan_service =
wifi_lan_medium_.GetRemoteWifiLanService(ip_address, port);