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

Merge changes from topic 'am-a57c7c884e184332ab6ba25437abb1a5'

Browse Source 
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 am: 134706940b am: 03e4bc1ead
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d am: 31b8e658d3 am: 996986254f
This commit is contained in:
Android Build Merger (Role)
2016-11-16 00:44:01 +00:00
committed by Android (Google) Code Review
parent 3c9006d842 c6d760ba1e
commit 06d202d3dd
2 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,11 +59,6 @@ interface IWifiManager
int addOrUpdateNetwork(in WifiConfiguration config);
int addPasspointManagementObject(String mo);
int modifyPasspointManagementObject(String fqdn,
in List<PasspointManagementObjectDefinition> mos);
boolean addPasspointConfiguration(in PasspointConfiguration config);
boolean removePasspointConfiguration(in String fqdn);
@@ -132,8 +127,6 @@ interface IWifiManager
WifiConfiguration getWifiApConfiguration();
WifiConfiguration buildWifiConfig(String uriString, String mimeType, in byte[] data);
void setWifiApConfiguration(in WifiConfiguration wifiConfig);
Messenger getWifiServiceMessenger();

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

@@ -841,36 +841,6 @@ public class WifiManager {
}
}
/**
* Add a Hotspot 2.0 release 2 Management Object
* @param mo The MO in XML form
* @return -1 for failure
* @hide
*/
public int addPasspointManagementObject(String mo) {
try {
return mService.addPasspointManagementObject(mo);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Modify a Hotspot 2.0 release 2 Management Object
* @param fqdn The FQDN of the service provider
* @param mos A List of MO definitions to be updated
* @return the number of nodes updated, or -1 for failure
* @hide
*/
public int modifyPasspointManagementObject(String fqdn,
List<PasspointManagementObjectDefinition> mos) {
try {
return mService.modifyPasspointManagementObject(fqdn, mos);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Add a Passpoint configuration. The configuration provides a credential
* for connecting to Passpoint networks that are operated by the Passpoint
@@ -1627,20 +1597,6 @@ public class WifiManager {
}
}
/**
* Builds a WifiConfiguration from Hotspot 2.0 MIME file.
* @return AP details in WifiConfiguration
*
* @hide Dont open yet
*/
public WifiConfiguration buildWifiConfig(String uriString, String mimeType, byte[] data) {
try {
return mService.buildWifiConfig(uriString, mimeType, data);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Sets the Wi-Fi AP Configuration.
* @return {@code true} if the operation succeeded, {@code false} otherwise