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

Commit c8505931 authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

Support EAP-SIM and EAP-AKA 

This change un-hides constants for these two methods and
also un-hides RADIUS/AAA FQDN field to allow creating
Passpoint release 1 credentials.

Change-Id: Ia3501017dc1f5c0b4932bb45e1e9c5bf7262d7fe
parent ec64709c

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -18336,6 +18336,7 @@ package android.net.wifi { 
    method public int describeContents();

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

    field public java.lang.String BSSID;

    field public java.lang.String FQDN;

    field public java.lang.String SSID;

    field public java.util.BitSet allowedAuthAlgorithms;

    field public java.util.BitSet allowedGroupCiphers;
@@ -18425,9 +18426,11 @@ package android.net.wifi { 
  }















  public static final class WifiEnterpriseConfig.Eap {













    field public static final int AKA = 5; // 0x5















    field public static final int NONE = -1; // 0xffffffff















    field public static final int PEAP = 0; // 0x0















    field public static final int PWD = 3; // 0x3













    field public static final int SIM = 4; // 0x4















    field public static final int TLS = 1; // 0x1















    field public static final int TTLS = 2; // 0x2















  }

























wifi/java/android/net/wifi/WifiConfiguration.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -223,9 +223,8 @@ public class WifiConfiguration implements Parcelable {













     */















    public String BSSID;















    /**













     * Fully qualified domain name (FQDN), for Passpoint credential.













     * Fully qualified domain name (FQDN) of AAA server or RADIUS server















     * e.g. {@code "mail.example.com"}.













     * @hide















     */















    public String FQDN;















    /**

































wifi/java/android/net/wifi/WifiEnterpriseConfig.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -224,9 +224,9 @@ public class WifiEnterpriseConfig implements Parcelable {













        public static final int TTLS    = 2;















        /** EAP-Password */















        public static final int PWD     = 3;













        /** EAP-Subscriber Identity Module {@hide} */













        /** EAP-Subscriber Identity Module */















        public static final int SIM     = 4;













        /** EAP-Authentication and Key Agreement {@hide} */













        /** EAP-Authentication and Key Agreement */















        public static final int AKA     = 5;















        /** @hide */















        public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA" };