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