commit 1575d9060535df8ee017608fbb2023f097f692e3
author vandwalle <vandwalle@google.com> Mon Aug 18 18:39:31 2014 -0700
committer Pierre Vandwalle <vandwalle@google.com> Tue Aug 19 01:54:41 2014 +0000
tree 9c1af1c7fc9ba656f10a8cd6f8fa2030c83ded73
parent dc77ea411a852d8c0086f5ea7663d2697cf81e7f

remove passpoint, except ANQP - DO NOT MERGE

This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149

Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 652bfe2..158dbb1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18775,25 +18775,8 @@
 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 {
@@ -18966,17 +18949,6 @@
     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 {

wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl

diff --git a/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl b/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
index 50bec33..54237c4 100644
--- a/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
+++ b/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
@@ -31,15 +31,5 @@
     Messenger getMessenger();
 
     int getPasspointState();
-
-    List<WifiPasspointPolicy> requestCredentialMatch(in List<ScanResult> requested);
-
-    List<WifiPasspointCredential> getCredentials();
-
-    boolean addCredential(in WifiPasspointCredential cred);
-
-    boolean updateCredential(in WifiPasspointCredential cred);
-
-    boolean removeCredential(in WifiPasspointCredential cred);
 }