Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9e55804 authored by Maurice Lam's avatar Maurice Lam Committed by Automerger Merge Worker
Browse files

Merge "Update usage of beto-rust UKEY2 APIs" into udc-dev am: cf2fc89d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22573192



Change-Id: Iefaaeba734e18baf1cd105a4c160b44e18202b32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d44c9cec cf2fc89d

services/companion/java/com/android/server/companion/securechannel/SecureChannel.java

+2 −3
Original line number Diff line number Diff line
@@ -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) {