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

Commit 3e4cad1b authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Switch to HexEncoding from ByteStringUtils

am: e3a92120

Change-Id: Ifd88f383842105db0cc36593d66a8b1d2a70ceac
parents 62a6b78b e3a92120
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ import android.content.ComponentName;
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 @@ public class DynamicCodeLoggingService extends JobService {
    }

    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);
    }
}