commit e3a92120bfce5fe19586f7c51157fc884628179c
author Neil Fuller <nfuller@google.com> Thu Apr 11 11:57:28 2019 +0100
committer Neil Fuller <nfuller@google.com> Thu Jun 06 15:08:17 2019 +0000
tree a4db8ca386f42402a3f0887db35377155cef2bce
parent ca48dd818250e171084290df5ae02688e5d001d2

Switch to HexEncoding from ByteStringUtils

Migration in preparation for deletion of ByteStringUtils.

Bug: 124232146
Test: build only
Change-Id: I2ffc14f05669309950e16334104274402a9fc104
(cherry picked from commit b92282a00a3c4d561bbe755496992369c3e98b44)

services/core/java/com/android/server/pm/DynamicCodeLoggingService.java

diff --git a/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java b/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java
index a1ff76fc..784f701 100644
--- a/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java
+++ b/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java
@@ -24,12 +24,13 @@
 import android.content.Context;
 import android.os.Process;
 import android.os.ServiceManager;
-import android.util.ByteStringUtils;
 import android.util.EventLog;
 import android.util.Log;
 
 import com.android.server.pm.dex.DynamicCodeLogger;
 
+import libcore.util.HexEncoding;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -280,10 +281,10 @@
     }
 
     private static String unhex(String hexEncodedPath) {
-        byte[] bytes = ByteStringUtils.fromHexToByteArray(hexEncodedPath);
-        if (bytes == null || bytes.length == 0) {
+        if (hexEncodedPath == null || hexEncodedPath.length() == 0) {
             return "";
         }
+        byte[] bytes = HexEncoding.decode(hexEncodedPath, false /* allowSingleChar */);
         return new String(bytes);
     }
 }