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

Browse Source 
am: fdbc827a52

Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b
This commit is contained in:
Peter Qiu
2017-01-08 07:06:20 +00:00
committed by android-build-merger
parent baf9bb8563 fdbc827a52
commit 5549acb0e6
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);
boolean addPasspointConfiguration(in PasspointConfiguration config);
boolean addOrUpdatePasspointConfiguration(in PasspointConfiguration config);
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
* service provider specified in the configuration.
*
* 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
* domain, the new configuration will replace the existing configuration.
* Name). In the case when there is an existing configuration with the same
* FQDN, the new configuration will replace the existing configuration.
*
* @param config The Passpoint configuration to be added
* @return true on success or false on failure
* @return true on success
* @hide
*/
public boolean addPasspointConfiguration(PasspointConfiguration config) {
public boolean addOrUpdatePasspointConfiguration(PasspointConfiguration config) {
try {
return mService.addPasspointConfiguration(config);
return mService.addOrUpdatePasspointConfiguration(config);
} catch (RemoteException e) {
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
* @return true on success or false on failure
* @return true on success
* @hide
*/
public boolean removePasspointConfiguration(String fqdn) {
@@ -880,7 +880,9 @@ public class WifiManager {
/**
* 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
*/
public List<PasspointConfiguration> getPasspointConfigurations() {