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

Merge "Amend typo and code clean up for V2 signature and PackageManagerShellCommand" am: 72b0ad5427 am: 1454bed017

Browse Source 
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>
This commit is contained in:
Treehugger Robot
2022-11-04 14:07:23 +00:00
committed by Automerger Merge Worker
parent 4c45b0e0a6 1454bed017
commit 979fb01dff
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
View File

@@ -93,8 +93,9 @@ 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
* @throws IOException if an I/O error occurs while reading the APK file. * not verify.
* @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)
throws SignatureNotFoundException, SecurityException, IOException { throws SignatureNotFoundException, SecurityException, IOException {
@@ -386,7 +387,6 @@ public class ApkSignatureSchemeV2Verifier {
break; break;
} }
} }
return;
} }
static byte[] getVerityRootHash(String apkPath) static byte[] getVerityRootHash(String apkPath)

2
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -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;
} }