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

Commit 54db33f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Switch to HexEncoding from ByteStringUtils"

parents 6222c464 6f34427e

services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java

+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}. */