From 612f1580497229e38b79c8c2fe48874077555405 Mon Sep 17 00:00:00 2001
From: Jerry Johns <johnsj@google.com>
Date: Thu, 16 Jun 2022 10:54:45 -0700
Subject: [PATCH] Merge conflict

---
 src/protocols/secure_channel/PairingSession.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocols/secure_channel/PairingSession.cpp b/src/protocols/secure_channel/PairingSession.cpp
index 4935511b72dd2f..ef87bedf3051c9 100644
--- a/src/protocols/secure_channel/PairingSession.cpp
+++ b/src/protocols/secure_channel/PairingSession.cpp
@@ -142,7 +142,7 @@ bool PairingSession::IsSessionEstablishmentInProgress()
     }
 
     Transport::SecureSession * secureSession = mSecureSessionHolder->AsSecureSession();
-    return secureSession->IsPairing();
+    return secureSession->IsEstablishing();
 }
 
 void PairingSession::Clear()