From 99afd9fadf3129d760b6024770c49da78131b951 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 11 Apr 2023 18:43:33 +0000
Subject: [PATCH] Update usage of beto-rust UKEY2 APIs

Bug: 277779968
Test: Test using permission sync test app
Change-Id: I5e0a0acbba77e2ddc7ec50eb4074d039472cee9b
---
 .../server/companion/securechannel/SecureChannel.java        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/companion/java/com/android/server/companion/securechannel/SecureChannel.java b/services/companion/java/com/android/server/companion/securechannel/SecureChannel.java
index a8519e388525d..0457e9aa345dc 100644
--- a/services/companion/java/com/android/server/companion/securechannel/SecureChannel.java
+++ b/services/companion/java/com/android/server/companion/securechannel/SecureChannel.java
@@ -28,7 +28,6 @@ import com.google.security.cryptauth.lib.securegcm.CryptoException;
 import com.google.security.cryptauth.lib.securegcm.D2DConnectionContextV1;
 import com.google.security.cryptauth.lib.securegcm.D2DHandshakeContext;
 import com.google.security.cryptauth.lib.securegcm.D2DHandshakeContext.Role;
-import com.google.security.cryptauth.lib.securegcm.DefaultUkey2Logger;
 import com.google.security.cryptauth.lib.securegcm.HandshakeException;
 
 import libcore.io.IoUtils;
@@ -329,7 +328,7 @@ public class SecureChannel {
         }
 
         mRole = Role.Initiator;
-        mHandshakeContext = D2DHandshakeContext.forInitiator(DefaultUkey2Logger.INSTANCE);
+        mHandshakeContext = D2DHandshakeContext.forInitiator();
 
         // Send Client Init
         if (DEBUG) {
@@ -350,7 +349,7 @@ public class SecureChannel {
 
         if (mHandshakeContext == null) { // Server-side logic
             mRole = Role.Responder;
-            mHandshakeContext = D2DHandshakeContext.forResponder(DefaultUkey2Logger.INSTANCE);
+            mHandshakeContext = D2DHandshakeContext.forResponder();
 
             // Receive Client Init
             if (DEBUG) {