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

Commit b4cc036c authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Switch to HexEncoding from ByteStringUtils"

parents d8b45754 6ae67f85

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

+5 −7
Original line number Diff line number Diff line
@@ -168,8 +168,8 @@ import android.content.pm.InstantAppRequest; 
import android.content.pm.InstantAppResolveInfo;

import android.content.pm.InstrumentationInfo;

import android.content.pm.IntentFilterVerificationInfo;

import android.content.pm.PackageBackwardCompatibility;

import android.content.pm.KeySet;

import android.content.pm.PackageBackwardCompatibility;

import android.content.pm.PackageCleanItem;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInfoLite;
@@ -259,7 +259,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;
@@ -299,8 +298,6 @@ import com.android.internal.util.FastXmlSerializer; 
import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;

import com.android.internal.util.function.QuadFunction;

import com.android.internal.util.function.TriFunction;

import com.android.server.AttributeCache;

import com.android.server.DeviceIdleController;

import com.android.server.EventLogTags;
@@ -336,6 +333,7 @@ import dalvik.system.CloseGuard; 
import dalvik.system.VMRuntime;















import libcore.io.IoUtils;













import libcore.util.HexEncoding;





























import org.xmlpull.v1.XmlPullParser;















import org.xmlpull.v1.XmlPullParserException;










@@ -380,7 +378,6 @@ import java.util.concurrent.TimeUnit;













import java.util.concurrent.atomic.AtomicBoolean;















import java.util.concurrent.atomic.AtomicInteger;















import java.util.function.BiConsumer;













import java.util.function.BiFunction;















import java.util.function.Predicate;





























/**










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



























                        // 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" +