Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to HexEncoding from ByteStringUtils"

Browse Source 
am: 6badf7c7da

Change-Id: I0af52cb2289e1df89ac65fa01334d4e9de69e010
This commit is contained in:
Neil Fuller
2019-04-24 06:08:15 -07:00
committed by android-build-merger
parent 15b57501ab 6badf7c7da
commit 78ccbc3bec
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/PackageParser.java
View File

@@ -80,7 +80,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;
@@ -99,6 +98,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;
@@ -5999,7 +5999,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;
}