diff options
| author | Wenchao Tong <tongwenchao@google.com> | 2014-08-20 03:17:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-20 03:17:57 +0000 |
| commit | 459fcb6c318a4c45c9729e7e19c150201b281595 (patch) | |
| tree | 84105d59c2276565cd1d162c987d8313edc2edf3 /wifi | |
| parent | c58f18d3a1a0b50d5f48393bc6eca83619bdfa3e (diff) | |
| parent | 8716fbb6829fea2acaaab97b8ab91a6f5146c159 (diff) | |
| download | frameworks_base-459fcb6c318a4c45c9729e7e19c150201b281595.zip frameworks_base-459fcb6c318a4c45c9729e7e19c150201b281595.tar.gz frameworks_base-459fcb6c318a4c45c9729e7e19c150201b281595.tar.bz2 | |
am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev
* commit '3e76a3aa299c6c7abde43ed5e9b780eb1dd13b8d':
Annotate @SystemApi on some WifiManager methods.
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 5 |
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(); |