diff options
| -rw-r--r-- | core/java/android/util/PackageUtils.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/util/PackageUtils.java b/core/java/android/util/PackageUtils.java index a5e38189f39b..8061bf36fa6a 100644 --- a/core/java/android/util/PackageUtils.java +++ b/core/java/android/util/PackageUtils.java @@ -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 */); } } |