diff options
| author | Wenchao Tong <tongwenchao@google.com> | 2014-08-21 16:47:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 16:47:38 +0000 |
| commit | 5223cc6167f79e9f2f2dcc3c461a63e79154883a (patch) | |
| tree | 97e0b5fa7ec2d59b738b9b3b113f719587082ebe /wifi/java/android/net/wifi/WifiManager.java | |
| parent | cf81d9475478c63558fb568c07acbc23af3dd70e (diff) | |
| parent | 0a3bd24f4cc57c1b2679c82a0532103e54b36d07 (diff) | |
| download | frameworks_base-5223cc6167f79e9f2f2dcc3c461a63e79154883a.zip frameworks_base-5223cc6167f79e9f2f2dcc3c461a63e79154883a.tar.gz frameworks_base-5223cc6167f79e9f2f2dcc3c461a63e79154883a.tar.bz2 | |
am de1bc6cb: am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev
* commit 'de1bc6cb3ecdfab5e7f42bc9f865f39a1ef0c01e':
Revert "Annotate @SystemApi on some WifiManager methods."
Diffstat (limited to 'wifi/java/android/net/wifi/WifiManager.java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 3efb0c8..1ca54bc 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1718,7 +1718,6 @@ public class WifiManager { * * @hide */ - @SystemApi public void connect(WifiConfiguration config, ActionListener listener) { if (config == null) throw new IllegalArgumentException("config cannot be null"); validateChannel(); @@ -1741,7 +1740,6 @@ 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(); @@ -1766,7 +1764,6 @@ 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(); @@ -1786,7 +1783,6 @@ 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(); @@ -1802,7 +1798,6 @@ 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(); |