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

Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jeff Davidson
2014-12-06 02:06:10 +00:00
committed by Android (Google) Code Review
parent 1edc73aa5d 93e4192c06
commit a4144563a5
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,5 +154,7 @@ interface IWifiManager
void setAllowScansWithTraffic(int enabled); void setAllowScansWithTraffic(int enabled);
WifiConnectionStatistics getConnectionStatistics(); WifiConnectionStatistics getConnectionStatistics();
void disableEphemeralNetwork(String SSID);
} }

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

@@ -1632,7 +1632,6 @@ public class WifiManager {
/** @hide */ /** @hide */
public static final int RSSI_PKTCNT_FETCH_FAILED = BASE + 22; public static final int RSSI_PKTCNT_FETCH_FAILED = BASE + 22;
/** /**
* Passed with {@link ActionListener#onFailure}. * Passed with {@link ActionListener#onFailure}.
* Indicates that the operation failed due to an internal error. * Indicates that the operation failed due to an internal error.
@@ -1981,6 +1980,20 @@ public class WifiManager {
sAsyncChannel.sendMessage(DISABLE_NETWORK, netId, putListener(listener)); sAsyncChannel.sendMessage(DISABLE_NETWORK, netId, putListener(listener));
} }
/**
* Disable ephemeral Network
*
* @param SSID, in the format of WifiConfiguration's SSID.
* @hide
*/
public void disableEphemeralNetwork(String SSID) {
if (SSID == null) throw new IllegalArgumentException("SSID cannot be null");
try {
mService.disableEphemeralNetwork(SSID);
} catch (RemoteException e) {
}
}
/** /**
* Start Wi-fi Protected Setup * Start Wi-fi Protected Setup
* *