diff options
| author | 2022-11-04 14:07:23 +0000 | |
|---|---|---|
| committer | 2022-11-04 14:07:23 +0000 | |
| commit | 979fb01dffba7ec4e931035958d8d2bab427591a (patch) | |
| tree | a7a305d32b59f8696c36af5aee441b1bf318114a | |
| parent | 4c45b0e0a6116ed39bb3a099366d00cd47c46b59 (diff) | |
| parent | 1454bed017e0a28ff10d125ac897b04fe079508e (diff) | |
Merge "Amend typo and code clean up for V2 signature and PackageManagerShellCommand" am: 72b0ad5427 am: 1454bed017
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2280796
Change-Id: Ib1b883b6d28d3a68f3db66a7f91fe14b2b1d914f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java | 6 | ||||
| -rw-r--r-- | services/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; } |