From 8fdca745d62f2d754d30ebbac95cf1c9f0456287 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 11 Apr 2019 11:30:05 +0100
Subject: [PATCH] Switch to HexEncoding from ByteStringUtils

Migration in preparation for deletion of ByteStringUtils.

Also contains an import ordering change needed for upload.

Bug: 124232146
Test: build only
Change-Id: I0c71751de9a142a81ce43b4eaea497bf291afcbc
---
 media/java/android/mtp/MtpServer.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media/java/android/mtp/MtpServer.java b/media/java/android/mtp/MtpServer.java
index f0ab9a3299531..042d02fa3d480 100644
--- a/media/java/android/mtp/MtpServer.java
+++ b/media/java/android/mtp/MtpServer.java
@@ -16,11 +16,12 @@
 
 package android.mtp;
 
-import com.android.internal.util.Preconditions;
-
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.util.ByteStringUtils;
+
+import com.android.internal.util.Preconditions;
+
+import libcore.util.HexEncoding;
 
 import java.io.FileDescriptor;
 import java.util.Random;
@@ -103,7 +104,7 @@ public class MtpServer implements Runnable {
         byte[] randomBytes = new byte[sID_LEN_BYTES];
 
         randomVal.nextBytes(randomBytes);
-        return ByteStringUtils.toHexString(randomBytes);
+        return HexEncoding.encodeToString(randomBytes);
     }
 
     public void start() {