Hotspot 2.0 - connect R1 used API to stateMachine(2/2)

Change-Id: I5a0b0873be51c06a015d508af2670d36008ca7f7

3 files changed, 32 insertions, 5 deletions

diff --git a/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl b/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
index 61c2b8a..50bec33 100644
--- a/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
+++ b/wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl
@@ -18,6 +18,7 @@ package android.net.wifi.passpoint;
 
 import android.net.wifi.ScanResult;
 import android.net.wifi.passpoint.WifiPasspointPolicy;
+import android.net.wifi.passpoint.WifiPasspointCredential;
 import android.os.Messenger;
 
 /**
@@ -28,7 +29,17 @@ import android.os.Messenger;
 interface IWifiPasspointManager
 {
     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);
 }
 
diff --git a/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java b/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java
index 33ccad5..0a7230f 100644
--- a/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java
+++ b/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java
@@ -333,7 +333,7 @@ public class WifiPasspointCredential implements Parcelable {
      * Set the fully qualified domain name (FQDN) of this Passpoint credential.
      * @param fqdn FQDN
      */
-    public void setFqdn(String fqdn) {
+    public void setHomeFqdn(String fqdn) {
         mHomeSpFqdn = fqdn;
     }
 
diff --git a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
index ddca85e..b9b17eb 100644
--- a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
+++ b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
@@ -496,7 +496,11 @@ public class WifiPasspointManager {
      * @return The list of credentials
      */
     public List<WifiPasspointCredential> getCredentials() {
-        return null;
+        try {
+            return mService.getCredentials();
+        } catch (RemoteException e) {
+            return null;
+        }
     }
 
     /**
@@ -506,7 +510,11 @@ public class WifiPasspointManager {
      * @return {@code true} if the operation succeeds, {@code false} otherwise
      */
     public boolean addCredential(WifiPasspointCredential cred) {
-        return true;
+        try {
+            return mService.addCredential(cred);
+        } catch (RemoteException e) {
+            return false;
+        }
     }
 
     /**
@@ -517,7 +525,11 @@ public class WifiPasspointManager {
      * @return {@code true} if the operation succeeds, {@code false} otherwise
      */
     public boolean updateCredential(WifiPasspointCredential cred) {
-        return true;
+        try {
+            return mService.updateCredential(cred);
+        } catch (RemoteException e) {
+            return false;
+        }
     }
 
     /**
@@ -528,7 +540,11 @@ public class WifiPasspointManager {
      * @return {@code true} if the operation succeeds, {@code false} otherwise
      */
     public boolean removeCredential(WifiPasspointCredential cred) {
-        return true;
+        try {
+            return mService.removeCredential(cred);
+        } catch (RemoteException e) {
+            return false;
+        }
     }
 
     public void startOsu(Channel c, WifiPasspointOsuProvider osu, OsuRemListener listener) {