Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52

Browse Source 
am: 5549acb0e6

Change-Id: I202a51c7d32ecf747fcc32597ac574b5faac2037
This commit is contained in:
Peter Qiu
2017-01-08 07:14:30 +00:00
committed by android-build-merger
parent 8bad14363e 5549acb0e6
commit fc9579cfda
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/IWifiManager.aidl
View File

@@ -59,7 +59,7 @@ interface IWifiManager
int addOrUpdateNetwork(in WifiConfiguration config); int addOrUpdateNetwork(in WifiConfiguration config);
boolean addPasspointConfiguration(in PasspointConfiguration config); boolean addOrUpdatePasspointConfiguration(in PasspointConfiguration config);
boolean removePasspointConfiguration(in String fqdn); boolean removePasspointConfiguration(in String fqdn);

20
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -842,31 +842,31 @@ public class WifiManager {
} }
/** /**
* Add a Passpoint configuration. The configuration provides a credential * Add or update a Passpoint configuration. The configuration provides a credential
* for connecting to Passpoint networks that are operated by the Passpoint * for connecting to Passpoint networks that are operated by the Passpoint
* service provider specified in the configuration. * service provider specified in the configuration.
* *
* Each configuration is uniquely identified by its FQDN (Fully Qualified Domain * Each configuration is uniquely identified by its FQDN (Fully Qualified Domain
* Name). In the case when there is an existing configuration with the same base * Name). In the case when there is an existing configuration with the same
* domain, the new configuration will replace the existing configuration. * FQDN, the new configuration will replace the existing configuration.
* *
* @param config The Passpoint configuration to be added * @param config The Passpoint configuration to be added
* @return true on success or false on failure * @return true on success
* @hide * @hide
*/ */
public boolean addPasspointConfiguration(PasspointConfiguration config) { public boolean addOrUpdatePasspointConfiguration(PasspointConfiguration config) {
try { try {
return mService.addPasspointConfiguration(config); return mService.addOrUpdatePasspointConfiguration(config);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
} }
/** /**
* Remove a Passpoint configuration identified by its FQDN (Fully Qualified Domain Name). * Remove the Passpoint configuration identified by its FQDN (Fully Qualified Domain Name).
* *
* @param fqdn The FQDN of the passpoint configuration to be removed * @param fqdn The FQDN of the passpoint configuration to be removed
* @return true on success or false on failure * @return true on success
* @hide * @hide
*/ */
public boolean removePasspointConfiguration(String fqdn) { public boolean removePasspointConfiguration(String fqdn) {
@@ -880,7 +880,9 @@ public class WifiManager {
/** /**
* Return the list of installed Passpoint configurations. * Return the list of installed Passpoint configurations.
* *
* @return A list of PasspointConfiguration or null * An empty list will be returned when no configurations are installed.
*
* @return A list of {@link PasspointConfiguration}
* @hide * @hide
*/ */
public List<PasspointConfiguration> getPasspointConfigurations() { public List<PasspointConfiguration> getPasspointConfigurations() {