Remove #include "third_party/nearby/proto/connections_enums.proto.h"

PiperOrigin-RevId: 414865191

cpp/core/internal/base_endpoint_channel.cc

@@ -25,7 +25,6 @@
 #include "platform/public/mutex.h"
 #include "platform/public/mutex_lock.h"
 #include "proto/connections_enums.pb.h"
-#include "proto/connections_enums.proto.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/base_endpoint_channel.h

@@ -30,7 +30,6 @@
 #include "platform/public/condition_variable.h"
 #include "platform/public/mutex.h"
 #include "platform/public/system_clock.h"
-#include "proto/connections_enums.proto.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/base_pcp_handler.cc

@@ -33,6 +33,7 @@
 #include "platform/base/bluetooth_utils.h"
 #include "platform/public/logging.h"
 #include "platform/public/system_clock.h"
+#include "proto/connections_enums.proto.h"
 
 namespace location {
 namespace nearby {
@@ -357,6 +358,7 @@ void BasePcpHandler::OnEncryptionSuccessRunnable(
 
   // Now we register our endpoint so that we can listen for both sides to
   // accept.
+  LogConnectionAttemptSuccess(endpoint_id, connection_info);
   endpoint_manager_->RegisterEndpoint(
       connection_info.client, endpoint_id,
       {
@@ -391,8 +393,6 @@ void BasePcpHandler::OnEncryptionSuccessRunnable(
       std::move(connection_info.channel), connection_info.listener,
       connection_info.connection_token);
 
-  LogConnectionAttemptSuccess(endpoint_id, connection_info);
-
   if (auto future_status = connection_info.result.lock()) {
     NEARBY_LOGS(INFO) << "Connection established; Finalising future OK.";
     future_status->Set({Status::kSuccess});
@@ -1491,6 +1491,11 @@ void BasePcpHandler::LogConnectionAttemptSuccess(
                 connection_info.channel->GetBand(),
                 connection_info.channel->GetFrequency(),
                 connection_info.channel->GetTryCount());
+  } else {
+    NEARBY_LOG(ERROR,
+               "PendingConnectionInfo channel is null for "
+               "LogConnectionAttemptSuccess. Bail out.");
+    return;
   }
   if (connection_info.is_incoming) {
     connection_info.client->GetAnalyticsRecorder().OnIncomingConnectionAttempt(