diff options
| author | Jeff Davidson <jpd@google.com> | 2014-12-09 01:00:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 01:00:29 +0000 |
| commit | 5d0bf5de0d334db6cbfb7d32fd3a5d31b2f7deee (patch) | |
| tree | 8acc1da89becaf49e89c69d00b3f7e7cb7e1771a /wifi/java/android/net/wifi/WifiManager.java | |
| parent | 902cc578a440eb957bc5ef387b8fd0f1c0640bff (diff) | |
| parent | 820ba1f96f5917db98df5b5d36cf5f4b32f50f59 (diff) | |
| download | frameworks_base-5d0bf5de0d334db6cbfb7d32fd3a5d31b2f7deee.zip frameworks_base-5d0bf5de0d334db6cbfb7d32fd3a5d31b2f7deee.tar.gz frameworks_base-5d0bf5de0d334db6cbfb7d32fd3a5d31b2f7deee.tar.bz2 | |
am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev
* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
add disable Ephemeral Network API Bug:18525241
Diffstat (limited to 'wifi/java/android/net/wifi/WifiManager.java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 15b6dd5..24bf115 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1654,7 +1654,6 @@ public class WifiManager { /** @hide */ public static final int RSSI_PKTCNT_FETCH_FAILED = BASE + 22; - /** * Passed with {@link ActionListener#onFailure}. * Indicates that the operation failed due to an internal error. @@ -2004,6 +2003,20 @@ public class WifiManager { } /** + * 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 * * @param config WPS configuration (does not support {@link WpsInfo#LABEL}) |