From 65c26fc43606f57521579dfa1b431a265e159b60 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 11 Apr 2019 12:03:42 +0100 Subject: [PATCH] Switch to HexEncoding from ByteStringUtils Migration in preparation for deletion of ByteStringUtils. Bug: 124232146 Test: build only Change-Id: Iff3a6b11adb8bcc51417a2e96e42c2db8a2de257 (cherry picked from commit 6f34427eb209a1c2b341c3aea034f46337308696) --- .../keys/RecoverableKeyStoreSecondaryKeyManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java b/services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java index db5fe77478a56..c89076b9928f0 100644 --- a/services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java +++ b/services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java @@ -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}. */