summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Maurice Lam <yukl@google.com> 2024-01-10 18:17:44 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-01-10 18:17:44 +0000
commit2ab8f35e511712b6ce1edb4a87a87d426dcd7ac1 (patch)
tree5ad3b96253837818b5705ece2f93f107218e09b8
parent2dbefb7f42e0856f8108a94945dbaed0e0a167cf (diff)
parent25ba0c7834698a05a3eb26a4cb05fa6e16a9aff4 (diff)
Merge "Update ukey2 references" into main
-rw-r--r--services/companion/java/com/android/server/companion/securechannel/SecureChannel.java12
1 files changed, 6 insertions, 6 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 720687ef20cc..0e66fbc020a1 100644
--- a/services/companion/java/com/android/server/companion/securechannel/SecureChannel.java
+++ b/services/companion/java/com/android/server/companion/securechannel/SecureChannel.java
@@ -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;