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

Commit 2f9380ea authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Switch to HexEncoding from ByteStringUtils" into qt-dev-plus-aosp 

am: 57750d13

Change-Id: Icd1a32b258009d558e72f80aa057ec25815f4266
parents 364c09f3 57750d13

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

+4 −3
Original line number Diff line number Diff line
@@ -256,7 +256,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;










@@ -10656,8 +10656,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" +