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

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

Merge "Update ukey2 references" into main am: 2ab8f35e am: 2d9a02e8 

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



Change-Id: I0c4c75f4f9cbe5c15d656a775f3dd18e87cf713f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d43dab52 2d9a02e8

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

+6 −6
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import android.content.Context; 
import android.os.Build;

import android.util.Slog;



import com.google.security.cryptauth.lib.securegcm.BadHandleException;

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.HandshakeException;

import com.google.security.cryptauth.lib.securegcm.ukey2.BadHandleException;

import com.google.security.cryptauth.lib.securegcm.ukey2.CryptoException;

import com.google.security.cryptauth.lib.securegcm.ukey2.D2DConnectionContextV1;

import com.google.security.cryptauth.lib.securegcm.ukey2.D2DHandshakeContext;

import com.google.security.cryptauth.lib.securegcm.ukey2.D2DHandshakeContext.Role;

import com.google.security.cryptauth.lib.securegcm.ukey2.HandshakeException;



import libcore.io.IoUtils;

import libcore.io.Streams;