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

Merge "Fix that the update to v1 signed version fails if apk verity is enabled"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-05 21:33:25 +00:00
committed by Gerrit Code Review
parent 83181d80c8 803f419451
commit 0b3fe647ef
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/util/apk/ApkSignatureVerifier.java
View File

@@ -397,15 +397,18 @@ public class ApkSignatureVerifier {
/** /**
* @return the verity root hash in the Signing Block. * @return the verity root hash in the Signing Block.
*/ */
public static byte[] getVerityRootHash(String apkPath) public static byte[] getVerityRootHash(String apkPath) throws IOException, SecurityException {
throws IOException, SignatureNotFoundException, SecurityException {
// first try v3 // first try v3
try { try {
return ApkSignatureSchemeV3Verifier.getVerityRootHash(apkPath); return ApkSignatureSchemeV3Verifier.getVerityRootHash(apkPath);
} catch (SignatureNotFoundException e) { } catch (SignatureNotFoundException e) {
// try older version // try older version
} }
return ApkSignatureSchemeV2Verifier.getVerityRootHash(apkPath); try {
return ApkSignatureSchemeV2Verifier.getVerityRootHash(apkPath);
} catch (SignatureNotFoundException e) {
return null;
}
} }
/** /**