Merge "Hotspot 2.0 - connect R1 used API to stateMachine(2/2)" (493563d5) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+20 −4

Original line number	Diff line number	Diff line
		@@ -496,8 +496,12 @@ public class WifiPasspointManager {
		* @return The list of credentials
		*/
		public List<WifiPasspointCredential> getCredentials() {
		try {
		return mService.getCredentials();
		} catch (RemoteException e) {
		return null;
		}
		}

		/**
		* Add a new Passpoint credential.
		@@ -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) {