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

Commit fd357096 authored by Ellen Arteca's avatar Ellen Arteca Committed by Automerger Merge Worker
Browse files

Merge "Throw new exceptions in SecureChannel from beto-rust update" into main... 

Merge "Throw new exceptions in SecureChannel from beto-rust update" into main am: 650ef384 am: db90ae77

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



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

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

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

import android.util.Slog;



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

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;
@@ -203,7 +204,8 @@ public class SecureChannel { 
     *

     * This method must only be called from one of the two participants.

     */

    public void establishSecureConnection() throws IOException, SecureChannelException {

    public void establishSecureConnection() throws IOException,

            SecureChannelException, HandshakeException {

        if (isSecured()) {

            Slog.d(TAG, "Channel is already secure.");

            return;
@@ -334,7 +336,7 @@ public class SecureChannel { 
        }

    }



    private void initiateHandshake() throws IOException, BadHandleException {

    private void initiateHandshake() throws IOException, BadHandleException , HandshakeException {

        if (mConnectionContext != null) {

            Slog.d(TAG, "Ukey2 handshake is already completed.");

            return;
@@ -394,8 +396,8 @@ public class SecureChannel { 
        }

    }



    private void exchangeHandshake()

            throws IOException, HandshakeException, BadHandleException, CryptoException {

    private void exchangeHandshake() throws IOException, HandshakeException,

            BadHandleException, CryptoException, AlertException {

        if (mConnectionContext != null) {

            Slog.d(TAG, "Ukey2 handshake is already completed.");

            return;