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

Commit bf274046 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Switch to HexEncoding from ByteStringUtils

am: 65c26fc4

Change-Id: I00f0f8c6bea69b16b193d84d5ac9ae4d777b780e
parents 3e4cad1b 65c26fc4
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ import android.content.Context;
import android.security.keystore.recovery.InternalRecoveryServiceException;
import android.security.keystore.recovery.LockScreenRequiredException;
import android.security.keystore.recovery.RecoveryController;
import android.util.ByteStringUtils;

import com.android.internal.annotations.VisibleForTesting;

import libcore.util.HexEncoding;

import java.security.SecureRandom;
import java.security.UnrecoverableKeyException;
import java.util.Optional;
@@ -108,7 +109,7 @@ public class RecoverableKeyStoreSecondaryKeyManager {
    private String generateId() {
        byte[] id = new byte[BACKUP_KEY_SUFFIX_LENGTH_BITS / BITS_PER_BYTE];
        mSecureRandom.nextBytes(id);
        return BACKUP_KEY_ALIAS_PREFIX + ByteStringUtils.toHexString(id);
        return BACKUP_KEY_ALIAS_PREFIX + HexEncoding.encodeToString(id);
    }

    /** Constructs a {@link RecoverableKeyStoreSecondaryKeyManager}. */