From e1d80fa415a2d305a7e6eb6b028a685f03577b5a Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 11 Apr 2019 11:23:10 +0100 Subject: [PATCH] Switch to HexEncoding from ByteStringUtils Migration in preparation for deletion of ByteStringUtils. Bug: 124232146 Test: atest CtsOsHostTestCases:StaticSharedLibsHostTests Change-Id: I6ee12e9914503a5b628ae6da82a396aa71dd972c --- .../java/com/android/server/pm/PackageManagerService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index eee01c258b2ef..e6c3f9bc5335b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -255,7 +255,6 @@ import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Base64; -import android.util.ByteStringUtils; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.ExceptionUtils; @@ -330,6 +329,7 @@ import dalvik.system.VMRuntime; import libcore.io.IoUtils; import libcore.util.EmptyArray; +import libcore.util.HexEncoding; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -10494,8 +10494,9 @@ public class PackageManagerService extends IPackageManager.Stub } else { // lib signing cert could have rotated beyond the one expected, check to see // if the new one has been blessed by the old - if (!libPkg.mSigningDetails.hasSha256Certificate( - ByteStringUtils.fromHexToByteArray(expectedCertDigests[0]))) { + byte[] digestBytes = HexEncoding.decode( + expectedCertDigests[0], false /* allowSingleChar */); + if (!libPkg.mSigningDetails.hasSha256Certificate(digestBytes)) { throw new PackageManagerException( INSTALL_FAILED_MISSING_SHARED_LIBRARY, "Package " + packageName + " requires differently signed" +