Merge "Fix that the update to v1 signed version fails if apk verity is enabled" (0b3fe647) · Commits · e / os / android_frameworks_base

core/java/android/util/apk/ApkSignatureVerifier.java

+6 −3

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

		/**