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

Commit 65c26fc4 authored by Neil Fuller's avatar Neil Fuller
Browse files

Switch to HexEncoding from ByteStringUtils 

Migration in preparation for deletion of ByteStringUtils.

Bug: 124232146
Test: build only
Change-Id: Iff3a6b11adb8bcc51417a2e96e42c2db8a2de257
(cherry picked from commit 6f34427e)
parent e3a92120

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