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

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

Merge "Switch to HexEncoding from ByteStringUtils" am: 70f7a0bf am: 0cb55a64

am: 5948b83b

Change-Id: I659eaff98c3ae024cbbc4b12340ca718063bbf61
parents 445930a6 5948b83b
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.pm.Signature;

import libcore.util.HexEncoding;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.security.MessageDigest;
@@ -125,6 +127,10 @@ public final class PackageUtils {
     * @return The digest or null if an error occurs.
     */
    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 */);
    }
}