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

Amend typo and code clean up for V2 signature and PackageManagerShellCommand

Browse Source 
Test: mtest
Change-Id: I43c62a9388637b5da21098f82f99d5199514e3ff
This commit is contained in:
Shen Lin
2022-11-03 19:57:43 +08:00
parent 78b6cfbe4d
commit 53e9982584
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.
*
* @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)

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

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