From d1a6913017aefc4847fd097a97f2c88847fe72f2 Mon Sep 17 00:00:00 2001
From: Anay Wadhera <awadhera@google.com>
Date: Thu, 25 Jan 2024 10:27:58 -0800
Subject: [PATCH] Don't check IsDiscovering() when going to rotate endpoint ID

PiperOrigin-RevId: 601489921
---
 connections/implementation/client_proxy.cc      | 2 +-
 connections/implementation/client_proxy_test.cc | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/connections/implementation/client_proxy.cc b/connections/implementation/client_proxy.cc
index 07cf4bb1..9aabeb6a 100644
--- a/connections/implementation/client_proxy.cc
+++ b/connections/implementation/client_proxy.cc
@@ -982,7 +982,7 @@ void ClientProxy::RemoveAllEndpoints() {
 
 void ClientProxy::OnSessionComplete() {
   MutexLock lock(&mutex_);
-  if (connections_.empty() && !IsAdvertising() && !IsDiscovering()) {
+  if (connections_.empty() && !IsAdvertising()) {
     local_endpoint_id_.clear();
 
     analytics_recorder_->LogSession();
diff --git a/connections/implementation/client_proxy_test.cc b/connections/implementation/client_proxy_test.cc
index e128f33c..48561f64 100644
--- a/connections/implementation/client_proxy_test.cc
+++ b/connections/implementation/client_proxy_test.cc
@@ -991,7 +991,9 @@ TEST_F(ClientProxyTest,
   // After
   OnDiscoveryConnectionDisconnected(&client2_, advertising_endpoint);
   client2_.GetAnalyticsRecorder().Sync();
-  EXPECT_EQ(event_logger2_.GetCompleteClientSessionCount(), 0);
+  // Since we are no longer checking IsDiscovering(), we complete sessions now
+  // solely based on advertising.
+  EXPECT_EQ(event_logger2_.GetCompleteClientSessionCount(), 1);
 }
 
 TEST_F(ClientProxyTest, LogSessionForResetClientProxy) {