mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 15:36:12 -04:00
Merge branch 'google3' to roll forward up to cl/351653246.
This commit is contained in:
@@ -166,7 +166,6 @@ class BasePcpHandler : public PcpHandler,
|
||||
|
||||
Pcp GetPcp() const override { return pcp_; }
|
||||
Strategy GetStrategy() const override { return strategy_; }
|
||||
Medium GetBwuMedium() const { return bwu_medium_.Get(); }
|
||||
void DisconnectFromEndpointManager();
|
||||
|
||||
protected:
|
||||
@@ -478,13 +477,15 @@ class BasePcpHandler : public PcpHandler,
|
||||
void WaitForLatch(const std::string& method_name, CountDownLatch* latch);
|
||||
Status WaitForResult(const std::string& method_name, std::int64_t client_id,
|
||||
Future<Status>* future);
|
||||
bool MediumSupported(const proto::connections::Medium& medium,
|
||||
const ConnectionOptions& options) const;
|
||||
bool MediumSupportedByClientOptions(
|
||||
const proto::connections::Medium& medium,
|
||||
const ConnectionOptions& client_options) const;
|
||||
std::vector<proto::connections::Medium>
|
||||
GetSupportedConnectionMediumsByPriority(
|
||||
const ConnectionOptions& options);
|
||||
const ConnectionOptions& local_option);
|
||||
std::string GetStringValueOfSupportedMediums(
|
||||
const ConnectionOptions& options) const;
|
||||
|
||||
AtomicReference<Medium> bwu_medium_{Medium::UNKNOWN_MEDIUM};
|
||||
ScheduledExecutor alarm_executor_;
|
||||
SingleThreadExecutor serial_executor_;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user