diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2014-05-30 17:08:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 17:08:07 +0000 |
| commit | 8407968db68f1838663118fd0b23576854b8c525 (patch) | |
| tree | dd61b3606c4fcc5321bf513dbca5a528c639fc3f /api | |
| parent | c05cb5ffb33ad59236cad29c920aea0a70c1178f (diff) | |
| parent | 0cb59f2c03daa056e2cb351bf2ee1c9338b61551 (diff) | |
| download | frameworks_base-8407968db68f1838663118fd0b23576854b8c525.zip frameworks_base-8407968db68f1838663118fd0b23576854b8c525.tar.gz frameworks_base-8407968db68f1838663118fd0b23576854b8c525.tar.bz2 | |
Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/api/current.txt b/api/current.txt index 336dd25..000df34 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7036,7 +7036,6 @@ package android.content { field public static final java.lang.String VIBRATOR_SERVICE = "vibrator"; field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper"; field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p"; - field public static final java.lang.String WIFI_PASSPOINT_SERVICE = "wifipasspoint"; field public static final java.lang.String WIFI_SERVICE = "wifi"; field public static final java.lang.String WINDOW_SERVICE = "window"; } @@ -17468,29 +17467,6 @@ package android.net.wifi.p2p.nsd { } -package android.net.wifi.passpoint { - - public class WifiPasspointCredential implements android.os.Parcelable { - ctor public WifiPasspointCredential(java.lang.String, android.net.wifi.WifiEnterpriseConfig); - method public int describeContents(); - method public java.lang.String getClientCertPath(); - method public int getEapMethod(); - method public java.lang.String getFqdn(); - method public java.lang.String getImsi(); - method public java.lang.String getRealm(); - method public java.lang.String getUserName(); - method public void writeToParcel(android.os.Parcel, int); - } - - public class WifiPasspointManager { - method public boolean addCredential(android.net.wifi.passpoint.WifiPasspointCredential); - method public java.util.List<android.net.wifi.passpoint.WifiPasspointCredential> getSavedCredentials(); - method public boolean removeCredential(android.net.wifi.passpoint.WifiPasspointCredential); - method public boolean updateCredential(android.net.wifi.passpoint.WifiPasspointCredential); - } - -} - package android.nfc { public class FormatException extends java.lang.Exception { |