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

Commit 01e95772 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Switch to HexEncoding from ByteStringUtils" am: 6badf7c7 

am: 78ccbc3b

Change-Id: Id4ca66a608a9df9fb357d5fd5e7179dc73cc8475
parents d8018260 78ccbc3b

core/java/android/content/pm/PackageParser.java

+3 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ import android.util.ArrayMap; 
import android.util.ArraySet;

import android.util.AttributeSet;

import android.util.Base64;

import android.util.ByteStringUtils;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.PackageUtils;
@@ -106,6 +105,7 @@ import com.android.internal.util.XmlUtils; 


import libcore.io.IoUtils;

import libcore.util.EmptyArray;

import libcore.util.HexEncoding;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -6247,7 +6247,8 @@ public class PackageParser { 
            }



            // first see if the hash represents a single-signer in our signing history

            byte[] sha256Bytes = ByteStringUtils.fromHexToByteArray(sha256String);

            byte[] sha256Bytes = sha256String == null

                    ? null : HexEncoding.decode(sha256String, false /* allowSingleChar */);

            if (hasSha256Certificate(sha256Bytes, flags)) {

                return true;

            }