From 53e998258458b7efee43b15b9c0da7c1dd2d3d95 Mon Sep 17 00:00:00 2001 From: Shen Lin Date: Thu, 3 Nov 2022 19:57:43 +0800 Subject: Amend typo and code clean up for V2 signature and PackageManagerShellCommand Test: mtest Change-Id: I43c62a9388637b5da21098f82f99d5199514e3ff --- core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java | 6 +++--- .../core/java/com/android/server/pm/PackageManagerShellCommand.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java index c8c1fd4eba21..eb467e0dcc38 100644 --- a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java +++ b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java @@ -93,8 +93,9 @@ public class ApkSignatureSchemeV2Verifier { * associated with each signer. * * @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 IOException if an I/O error occurs while reading the APK file. + * @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. */ public static X509Certificate[][] verify(String apkFile) throws SignatureNotFoundException, SecurityException, IOException { @@ -386,7 +387,6 @@ public class ApkSignatureSchemeV2Verifier { break; } } - return; } static byte[] getVerityRootHash(String apkPath) diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 46691a61930e..1e64701ebab7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -3630,7 +3630,7 @@ class PackageManagerShellCommand extends ShellCommand { fd = ParcelFileDescriptor.dup(getInFileDescriptor()); } if (sizeBytes <= 0) { - getErrPrintWriter().println("Error: must specify a APK size"); + getErrPrintWriter().println("Error: must specify an APK size"); return 1; } -- cgit v1.2.3-59-g8ed1b