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

Commit b766701f authored by Yan Yan's avatar Yan Yan
Browse files

Expose new algorithms as public API 

Bug: 161716062
Test: FrameworksNetTests:IpSecAlgorithmTest
Change-Id: I5041c61ad5a4aa58b259e24de80a2c63d6b19dae
parent 27267b65

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -30048,9 +30048,12 @@ package android.net { 
    method public int describeContents();

    method @NonNull public byte[] getKey();

    method @NonNull public String getName();

    method @NonNull public static java.util.Set<java.lang.String> getSupportedAlgorithms();

    method public int getTruncationLengthBits();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final String AUTH_AES_XCBC = "xcbc(aes)";

    field public static final String AUTH_CRYPT_AES_GCM = "rfc4106(gcm(aes))";

    field public static final String AUTH_CRYPT_CHACHA20_POLY1305 = "rfc7539esp(chacha20,poly1305)";

    field public static final String AUTH_HMAC_MD5 = "hmac(md5)";

    field public static final String AUTH_HMAC_SHA1 = "hmac(sha1)";

    field public static final String AUTH_HMAC_SHA256 = "hmac(sha256)";
@@ -30058,6 +30061,7 @@ package android.net { 
    field public static final String AUTH_HMAC_SHA512 = "hmac(sha512)";

    field @NonNull public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;

    field public static final String CRYPT_AES_CBC = "cbc(aes)";

    field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))";

  }















  public final class IpSecManager {

























core/java/android/net/IpSecAlgorithm.java



+0
−8




























Original line number
Diff line number
Diff line








@@ -74,8 +74,6 @@ public final class IpSecAlgorithm implements Parcelable {













     * requested on an unsupported device.















     *















     * <p>@see {@link #getSupportedAlgorithms()}













     *













     * @hide















     */















    // This algorithm may be available on devices released before Android 12, and is guaranteed















    // to be available on devices first shipped with Android 12 or later.










@@ -142,8 +140,6 @@ public final class IpSecAlgorithm implements Parcelable {













     * requested on an unsupported device.















     *















     * <p>@see {@link #getSupportedAlgorithms()}













     *













     * @hide















     */















    // This algorithm may be available on devices released before Android 12, and is guaranteed















    // to be available on devices first shipped with Android 12 or later.










@@ -180,8 +176,6 @@ public final class IpSecAlgorithm implements Parcelable {













     * requested on an unsupported device.















     *















     * <p>@see {@link #getSupportedAlgorithms()}













     *













     * @hide















     */















    // This algorithm may be available on devices released before Android 12, and is guaranteed















    // to be available on devices first shipped with Android 12 or later.










@@ -314,8 +308,6 @@ public final class IpSecAlgorithm implements Parcelable {













     *















     * <p>Some algorithms may not be supported on old devices. Callers MUST check if an algorithm is















     * supported before using it.













     *













     * @hide















     */















    @NonNull















    public static Set<String> getSupportedAlgorithms() {

































non-updatable-api/current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -29827,9 +29827,12 @@ package android.net {













    method public int describeContents();















    method @NonNull public byte[] getKey();















    method @NonNull public String getName();













    method @NonNull public static java.util.Set<java.lang.String> getSupportedAlgorithms();















    method public int getTruncationLengthBits();















    method public void writeToParcel(android.os.Parcel, int);













    field public static final String AUTH_AES_XCBC = "xcbc(aes)";















    field public static final String AUTH_CRYPT_AES_GCM = "rfc4106(gcm(aes))";













    field public static final String AUTH_CRYPT_CHACHA20_POLY1305 = "rfc7539esp(chacha20,poly1305)";















    field public static final String AUTH_HMAC_MD5 = "hmac(md5)";















    field public static final String AUTH_HMAC_SHA1 = "hmac(sha1)";















    field public static final String AUTH_HMAC_SHA256 = "hmac(sha256)";









@@ -29837,6 +29840,7 @@ package android.net {













    field public static final String AUTH_HMAC_SHA512 = "hmac(sha512)";















    field @NonNull public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;















    field public static final String CRYPT_AES_CBC = "cbc(aes)";













    field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))";















  }





























  public final class IpSecManager {