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

Commit 68757ef6 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev 

* commit '63e550f2':
  Add getters and private constructor
parents 1c6e609b 63e550f2

api/current.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -13931,8 +13931,11 @@ package android.net.wifi { 
    ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);

    ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);

    method public int describeContents();

    method public int describeContents();

    method public java.lang.String getAnonymousIdentity();

    method public java.lang.String getAnonymousIdentity();

    method public java.security.cert.X509Certificate getCaCertificate();

    method public java.security.cert.X509Certificate getClientCertificate();

    method public int getEapMethod();

    method public int getEapMethod();

    method public java.lang.String getIdentity();

    method public java.lang.String getIdentity();

    method public java.lang.String getPassword();

    method public int getPhase2Method();

    method public int getPhase2Method();

    method public java.lang.String getSubjectMatch();

    method public java.lang.String getSubjectMatch();

    method public void setAnonymousIdentity(java.lang.String);

    method public void setAnonymousIdentity(java.lang.String);
@@ -13948,7 +13951,6 @@ package android.net.wifi { 
  }

  }

















  public static final class WifiEnterpriseConfig.Eap {







  public static final class WifiEnterpriseConfig.Eap {











    ctor public WifiEnterpriseConfig.Eap();














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







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











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







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











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







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









@@ -13957,7 +13959,6 @@ package android.net.wifi {









  }







  }



























  public static final class WifiEnterpriseConfig.Phase2 {







  public static final class WifiEnterpriseConfig.Phase2 {











    ctor public WifiEnterpriseConfig.Phase2();














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







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











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







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











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







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

























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



+34
−0




























Original line number
Original line
Diff line number
Diff line








@@ -223,6 +223,9 @@ public class WifiEnterpriseConfig implements Parcelable {









        public static final int PWD     = 3;







        public static final int PWD     = 3;











        /** @hide */







        /** @hide */











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







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





























        /** Prevent initialization */














        private Eap() {}











    }







    }































    /** The inner authentication method used */







    /** The inner authentication method used */









@@ -239,6 +242,9 @@ public class WifiEnterpriseConfig implements Parcelable {









        private static final String PREFIX = "auth=";







        private static final String PREFIX = "auth=";











        /** @hide */







        /** @hide */











        public static final String[] strings = {EMPTY_VALUE, "PAP", "MSCHAP", "MSCHAPV2", "GTC" };







        public static final String[] strings = {EMPTY_VALUE, "PAP", "MSCHAP", "MSCHAPV2", "GTC" };





























        /** Prevent initialization */














        private Phase2() {}











    }







    }































    /** Internal use only */







    /** Internal use only */










@@ -362,6 +368,16 @@ public class WifiEnterpriseConfig implements Parcelable {









        setFieldValue(PASSWORD_KEY, password, "");







        setFieldValue(PASSWORD_KEY, password, "");











    }







    }


































    /**














     * Get the password.














     *














     * Returns locally set password value. For networks fetched from














     * framework, returns "*".














     */














    public String getPassword() {














        return getFieldValue(PASSWORD_KEY, "");














    }


























    /**







    /**











     * Set CA certificate alias.







     * Set CA certificate alias.











     *







     *










@@ -403,6 +419,15 @@ public class WifiEnterpriseConfig implements Parcelable {









        }







        }











    }







    }


































    /**














     * Get CA certificate














     *














     * @return X.509 CA certificate














     */














    public X509Certificate getCaCertificate() {














        return mCaCert;














    }


























    /**







    /**











     * Set Client certificate alias.







     * Set Client certificate alias.











     *







     *










@@ -463,6 +488,15 @@ public class WifiEnterpriseConfig implements Parcelable {









        mClientCertificate = clientCertificate;







        mClientCertificate = clientCertificate;











    }







    }


































    /**














     * Get client certificate














     *














     * @return X.509 client certificate














     */














    public X509Certificate getClientCertificate() {














        return mClientCertificate;














    }


























    boolean needsKeyStore() {







    boolean needsKeyStore() {











        // Has no keys to be installed







        // Has no keys to be installed











        if (mClientCertificate == null && mCaCert == null) return false;







        if (mClientCertificate == null && mCaCert == null) return false;