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

Commit c9e2739f authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Add correct annotation for the version.

Bug: 297916136
Test: presubmit
Change-Id: I8b8bd60085064e423f075bc7ff7a9cf6c8937d32
parent 3bcd093f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -13418,12 +13418,12 @@ package android.content.pm {
  public final class SigningInfo implements android.os.Parcelable {
    ctor public SigningInfo();
    ctor @FlaggedApi("android.content.pm.archiving") public SigningInfo(@IntRange(from=0) int, @Nullable java.util.Collection<android.content.pm.Signature>, @Nullable java.util.Collection<java.security.PublicKey>, @Nullable java.util.Collection<android.content.pm.Signature>);
    ctor @FlaggedApi("android.content.pm.archiving") public SigningInfo(int, @Nullable java.util.Collection<android.content.pm.Signature>, @Nullable java.util.Collection<java.security.PublicKey>, @Nullable java.util.Collection<android.content.pm.Signature>);
    ctor public SigningInfo(android.content.pm.SigningInfo);
    method public int describeContents();
    method public android.content.pm.Signature[] getApkContentsSigners();
    method @FlaggedApi("android.content.pm.archiving") @NonNull public java.util.Collection<java.security.PublicKey> getPublicKeys();
    method @FlaggedApi("android.content.pm.archiving") @IntRange(from=0) public int getSchemeVersion();
    method @FlaggedApi("android.content.pm.archiving") public int getSchemeVersion();
    method public android.content.pm.Signature[] getSigningCertificateHistory();
    method public boolean hasMultipleSigners();
    method public boolean hasPastSigningCertificates();
+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import com.android.internal.util.DataClass;

import libcore.util.HexEncoding;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.security.PublicKey;
import java.security.cert.CertificateException;
import java.util.ArrayList;
@@ -49,6 +51,7 @@ public final class SigningDetails implements Parcelable {

    private static final String TAG = "SigningDetails";

    @Retention(RetentionPolicy.SOURCE)
    @IntDef({SignatureSchemeVersion.UNKNOWN,
            SignatureSchemeVersion.JAR,
            SignatureSchemeVersion.SIGNING_BLOCK_V2,
+3 −3
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@
package android.content.pm;

import android.annotation.FlaggedApi;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.pm.SigningDetails.SignatureSchemeVersion;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.ArraySet;
@@ -53,7 +53,7 @@ public final class SigningInfo implements Parcelable {
     * schemas</a>
     */
    @FlaggedApi(Flags.FLAG_ARCHIVING)
    public SigningInfo(@IntRange(from = 0) int schemeVersion,
    public SigningInfo(@SignatureSchemeVersion int schemeVersion,
            @Nullable Collection<Signature> apkContentsSigners,
            @Nullable Collection<PublicKey> publicKeys,
            @Nullable Collection<Signature> signingCertificateHistory) {
@@ -168,7 +168,7 @@ public final class SigningInfo implements Parcelable {
     * schemas</a>
     */
    @FlaggedApi(Flags.FLAG_ARCHIVING)
    public @IntRange(from = 0) int getSchemeVersion() {
    public @SignatureSchemeVersion int getSchemeVersion() {
        return mSigningDetails.getSignatureSchemeVersion();
    }