diff options
| author | Wenchao Tong <tongwenchao@google.com> | 2014-08-20 03:27:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-20 03:27:12 +0000 |
| commit | b413f19d8f634bafdee1ba4e0d7f5d070158bcca (patch) | |
| tree | 443a3090c211965443bc74e9e720f6dffa104378 /wifi | |
| parent | 2130c76a351815b5656bbf769245299f9763bb84 (diff) | |
| parent | 459fcb6c318a4c45c9729e7e19c150201b281595 (diff) | |
| download | frameworks_base-b413f19d8f634bafdee1ba4e0d7f5d070158bcca.zip frameworks_base-b413f19d8f634bafdee1ba4e0d7f5d070158bcca.tar.gz frameworks_base-b413f19d8f634bafdee1ba4e0d7f5d070158bcca.tar.bz2 | |
am 143817b4: am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev
* commit '143817b4302baa8f42f2f2a489a75b429735a3eb':
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 1ca54bc..3efb0c8 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1718,6 +1718,7 @@ public class WifiManager { * * @hide */ + @SystemApi public void connect(WifiConfiguration config, ActionListener listener) { if (config == null) throw new IllegalArgumentException("config cannot be null"); validateChannel(); @@ -1740,6 +1741,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(); @@ -1764,6 +1766,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(); @@ -1783,6 +1786,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(); @@ -1798,6 +1802,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(); |