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
This commit is contained in:
Neil Fuller
2019-04-09 09:50:59 +00:00
committed by Gerrit Code Review
parent e467620566 b39d83ebf0
commit 70f7a0bf04
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/util/PackageUtils.java
View File

@@ -20,6 +20,8 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.pm.Signature; import android.content.pm.Signature;
import libcore.util.HexEncoding;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.security.MessageDigest; import java.security.MessageDigest;
@@ -125,6 +127,10 @@ public final class PackageUtils {
* @return The digest or null if an error occurs. * @return The digest or null if an error occurs.
*/ */
public static @Nullable String computeSha256Digest(@NonNull byte[] data) { public static @Nullable String computeSha256Digest(@NonNull byte[] data) {
return ByteStringUtils.toHexString(computeSha256DigestBytes(data)); byte[] sha256DigestBytes = computeSha256DigestBytes(data);
if (sha256DigestBytes == null) {
return null;
}
return HexEncoding.encodeToString(sha256DigestBytes, true /* uppercase */);
} }
} }