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

Commit 4ad8c73c authored by Neil Fuller's avatar Neil Fuller
Browse files

Switch to HexEncoding from ByteStringUtils 

Migration in preparation for deletion of ByteStringUtils.

This commit switches bluetooth unit test code from
android.util.ByteStringUtils to libcore.util.HexEncoding.
Neither are public APIs but ByteStringUtils is being deleted.

Bug: 124232146
Test: build only
Change-Id: I6a7eaf75ed05a596f9041a123f50814c0877bcbb
parent 14fbb541

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+3 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.os.Process; 
import android.os.SystemProperties;

import android.os.UserManager;

import android.test.mock.MockContentResolver;

import android.util.ByteStringUtils;

import android.util.Log;



import androidx.test.InstrumentationRegistry;
@@ -46,6 +45,8 @@ import com.android.bluetooth.R; 
import com.android.bluetooth.TestUtils;

import com.android.bluetooth.Utils;



import libcore.util.HexEncoding;



import org.junit.After;

import org.junit.Assert;

import org.junit.Before;
@@ -685,7 +686,7 @@ public class AdapterServiceTest { 
            Log.e(TAG, "Salt256Bit is null: " + metricsSection.toString());

            return null;

        }

        byte[] metricsSalt = ByteStringUtils.fromHexToByteArray(saltString);

        byte[] metricsSalt = HexEncoding.decode(saltString, false /* allowSingleChar */);

        if (metricsSalt.length != 32) {

            Log.e(TAG, "Salt length is not 32 bit, but is " + metricsSalt.length);

            return null;