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

Commit 0342cfce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Amend typo and code clean up for V2 signature and... 

Merge "Amend typo and code clean up for V2 signature and PackageManagerShellCommand" am: 72b0ad54 am: 1454bed0 am: 979fb01d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2280796



Change-Id: Ibbe0303ca7d0bd2fab979329fa771243d061ee09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba553950 979fb01d

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

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ 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 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)
@@ -386,7 +387,6 @@ public class ApkSignatureSchemeV2Verifier { 
                    break;

            }

        }

        return;

    }



    static byte[] getVerityRootHash(String apkPath)

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

+1 −1
Original line number Diff line number Diff line
@@ -3707,7 +3707,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;

            }