diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-09 19:01:37 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-09 19:01:37 -0700 |
| commit | d2585f3050f749e471d79abb0dd54bd20445de05 (patch) | |
| tree | 4f3d37ed3da5a2850b02151d8725a1d6636e6b79 /api | |
| parent | e95944300eccf78a871fbfaf0545c7550ab424a5 (diff) | |
| parent | b21d2489c1bd330e39f4489c7f221ebb4dffc283 (diff) | |
| download | frameworks_base-d2585f3050f749e471d79abb0dd54bd20445de05.zip frameworks_base-d2585f3050f749e471d79abb0dd54bd20445de05.tar.gz frameworks_base-d2585f3050f749e471d79abb0dd54bd20445de05.tar.bz2 | |
am "Passpoint API - Take 1"
merged from partner/m-wireless-wifi-dev
b21d248 Passpoint API - Take 1
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 3244d83..f2b7ba3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17914,6 +17914,8 @@ package android.net.wifi { field public int networkId; field public java.lang.String preSharedKey; field public int priority; + field public java.lang.String providerFriendlyName; + field public java.util.HashSet<java.lang.Long> roamingConsortiumIds; field public int status; field public java.lang.String[] wepKeys; field public int wepTxKeyIndex; @@ -17971,6 +17973,7 @@ package android.net.wifi { ctor public WifiEnterpriseConfig(); ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig); method public int describeContents(); + method public java.lang.String getAltSubjectMatch(); method public java.lang.String getAnonymousIdentity(); method public java.security.cert.X509Certificate getCaCertificate(); method public java.security.cert.X509Certificate getClientCertificate(); @@ -17978,7 +17981,10 @@ package android.net.wifi { method public java.lang.String getIdentity(); method public java.lang.String getPassword(); method public int getPhase2Method(); - method public java.lang.String getSubjectMatch(); + method public java.lang.String getPlmn(); + method public java.lang.String getRealm(); + method public deprecated java.lang.String getSubjectMatch(); + method public void setAltSubjectMatch(java.lang.String); method public void setAnonymousIdentity(java.lang.String); method public void setCaCertificate(java.security.cert.X509Certificate); method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate); @@ -17986,7 +17992,9 @@ package android.net.wifi { method public void setIdentity(java.lang.String); method public void setPassword(java.lang.String); method public void setPhase2Method(int); - method public void setSubjectMatch(java.lang.String); + method public void setPlmn(java.lang.String); + method public void setRealm(java.lang.String); + method public deprecated void setSubjectMatch(java.lang.String); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.WifiEnterpriseConfig> CREATOR; } |