summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorWenchao Tong <tongwenchao@google.com>2014-08-20 02:58:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 02:43:23 +0000
commit36ecb30b870c445521587a5538d0c4dadda8f45c (patch)
treee32fa69455d6a7e595f2e6bad5dd348c7538489e /wifi/java/android/net
parent155bbf1ea4f28717fb52ef6324137b65e7c3cac1 (diff)
parent4d114920719d4bdf6c014a9475178bbd0eba905d (diff)
downloadframeworks_base-36ecb30b870c445521587a5538d0c4dadda8f45c.zip
frameworks_base-36ecb30b870c445521587a5538d0c4dadda8f45c.tar.gz
frameworks_base-36ecb30b870c445521587a5538d0c4dadda8f45c.tar.bz2
Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index e27bd7e..3d976e7 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1696,6 +1696,7 @@ public class WifiManager {
*
* @hide
*/
+ @SystemApi
public void connect(WifiConfiguration config, ActionListener listener) {
if (config == null) throw new IllegalArgumentException("config cannot be null");
validateChannel();
@@ -1718,6 +1719,7 @@ public class WifiManager {
* initialized again
* @hide
*/
+ @SystemApi
public void connect(int networkId, ActionListener listener) {
if (networkId < 0) throw new IllegalArgumentException("Network id cannot be negative");
validateChannel();
@@ -1742,6 +1744,7 @@ public class WifiManager {
* initialized again
* @hide
*/
+ @SystemApi
public void save(WifiConfiguration config, ActionListener listener) {
if (config == null) throw new IllegalArgumentException("config cannot be null");
validateChannel();
@@ -1761,6 +1764,7 @@ public class WifiManager {
* initialized again
* @hide
*/
+ @SystemApi
public void forget(int netId, ActionListener listener) {
if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");
validateChannel();
@@ -1776,6 +1780,7 @@ public class WifiManager {
* initialized again
* @hide
*/
+ @SystemApi
public void disable(int netId, ActionListener listener) {
if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");
validateChannel();