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

Commit 57750d13 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

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

parents 40bcb1d3 3bebef51

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -256,7 +256,6 @@ import android.text.format.DateUtils; 
import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Base64;

import android.util.Base64;

import android.util.ByteStringUtils;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.EventLog;

import android.util.ExceptionUtils;

import android.util.ExceptionUtils;
@@ -330,6 +329,7 @@ import dalvik.system.VMRuntime; 
















import libcore.io.IoUtils;







import libcore.io.IoUtils;











import libcore.util.EmptyArray;







import libcore.util.EmptyArray;














import libcore.util.HexEncoding;



























import org.xmlpull.v1.XmlPullParser;







import org.xmlpull.v1.XmlPullParser;











import org.xmlpull.v1.XmlPullParserException;







import org.xmlpull.v1.XmlPullParserException;










@@ -10656,8 +10656,9 @@ public class PackageManagerService extends IPackageManager.Stub









                    } else {







                    } else {











                        // lib signing cert could have rotated beyond the one expected, check to see







                        // lib signing cert could have rotated beyond the one expected, check to see











                        // if the new one has been blessed by the old







                        // if the new one has been blessed by the old











                        if (!libPkg.mSigningDetails.hasSha256Certificate(







                        byte[] digestBytes = HexEncoding.decode(











                                ByteStringUtils.fromHexToByteArray(expectedCertDigests[0]))) {







                                expectedCertDigests[0], false /* allowSingleChar */);














                        if (!libPkg.mSigningDetails.hasSha256Certificate(digestBytes)) {











                            throw new PackageManagerException(







                            throw new PackageManagerException(











                                    INSTALL_FAILED_MISSING_SHARED_LIBRARY,







                                    INSTALL_FAILED_MISSING_SHARED_LIBRARY,











                                    "Package " + packageName + " requires differently signed" +







                                    "Package " + packageName + " requires differently signed" +