summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorvandwalle <vandwalle@google.com>2014-08-20 19:07:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-20 16:06:26 +0000
commitda3475dba70965908bbef269a004a71433963532 (patch)
tree72d69caa798cfed15e915f7a291179632d1853c1 /api
parentfd3b324feb81a05443a2c245bf61df0309db01e1 (diff)
parent1575d9060535df8ee017608fbb2023f097f692e3 (diff)
downloadframeworks_base-da3475dba70965908bbef269a004a71433963532.zip
frameworks_base-da3475dba70965908bbef269a004a71433963532.tar.gz
frameworks_base-da3475dba70965908bbef269a004a71433963532.tar.bz2
Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt28
1 files changed, 0 insertions, 28 deletions
diff --git a/api/current.txt b/api/current.txt
index 5a82f1d..eabf599 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18464,25 +18464,8 @@ package android.net.wifi.p2p.nsd {
package android.net.wifi.passpoint {
public abstract interface IWifiPasspointManager implements android.os.IInterface {
- method public abstract boolean addCredential(android.net.wifi.passpoint.WifiPasspointCredential) throws android.os.RemoteException;
- method public abstract java.util.List<android.net.wifi.passpoint.WifiPasspointCredential> getCredentials() throws android.os.RemoteException;
method public abstract android.os.Messenger getMessenger() throws android.os.RemoteException;
method public abstract int getPasspointState() throws android.os.RemoteException;
- method public abstract boolean removeCredential(android.net.wifi.passpoint.WifiPasspointCredential) throws android.os.RemoteException;
- method public abstract java.util.List<android.net.wifi.passpoint.WifiPasspointPolicy> requestCredentialMatch(java.util.List<android.net.wifi.ScanResult>) throws android.os.RemoteException;
- method public abstract boolean updateCredential(android.net.wifi.passpoint.WifiPasspointCredential) throws android.os.RemoteException;
- }
-
- public class WifiPasspointCredential implements android.os.Parcelable {
- ctor public WifiPasspointCredential(java.lang.String, java.lang.String, android.net.wifi.WifiEnterpriseConfig);
- method public int describeContents();
- method public android.net.wifi.WifiEnterpriseConfig getEnterpriseConfig();
- method public java.lang.String getHomeSpFqdn();
- method public java.lang.String getRealm();
- method public void setEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);
- method public void setHomeFqdn(java.lang.String);
- method public void setRealm(java.lang.String);
- method public void writeToParcel(android.os.Parcel, int);
}
public class WifiPasspointInfo implements android.os.Parcelable {
@@ -18655,17 +18638,6 @@ package android.net.wifi.passpoint {
field public java.lang.String ssid;
}
- public class WifiPasspointPolicy implements android.os.Parcelable {
- method public android.net.wifi.WifiConfiguration createWifiConfiguration();
- method public int describeContents();
- method public java.lang.String getBssid();
- method public android.net.wifi.passpoint.WifiPasspointCredential getCredential();
- method public int getCredentialPriority();
- method public int getRoamingPriority();
- method public java.lang.String getSsid();
- method public void writeToParcel(android.os.Parcel, int);
- }
-
}
package android.nfc {