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

Commit 53e99825 authored Nov 03, 2022 by Shen Lin

Amend typo and code clean up for V2 signature and PackageManagerShellCommand

Test: mtest
Change-Id: I43c62a9388637b5da21098f82f99d5199514e3ff

parent 78b6cfbe

core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,8 @@ public class ApkSignatureSchemeV2Verifier {
	* associated with each signer.		* associated with each signer.
	*		*
	* @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v2.		* @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v2.
	* @throws SecurityException if a APK Signature Scheme v2 signature of this APK does not verify.		* @throws SecurityException if an APK Signature Scheme v2 signature of this APK does
			* not verify.
	* @throws IOException if an I/O error occurs while reading the APK file.		* @throws IOException if an I/O error occurs while reading the APK file.
	*/		*/
	public static X509Certificate[][] verify(String apkFile)		public static X509Certificate[][] verify(String apkFile)
	@@ -386,7 +387,6 @@ public class ApkSignatureSchemeV2Verifier {
	break;		break;
	}		}
	}		}
	return;
	}		}

	static byte[] getVerityRootHash(String apkPath)		static byte[] getVerityRootHash(String apkPath)

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3630,7 +3630,7 @@ class PackageManagerShellCommand extends ShellCommand {
	fd = ParcelFileDescriptor.dup(getInFileDescriptor());		fd = ParcelFileDescriptor.dup(getInFileDescriptor());
	}		}
	if (sizeBytes <= 0) {		if (sizeBytes <= 0) {
	getErrPrintWriter().println("Error: must specify a APK size");		getErrPrintWriter().println("Error: must specify an APK size");
	return 1;		return 1;
	}		}