summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorWenchao Tong <tongwenchao@google.com>2014-08-21 16:04:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-21 16:05:00 +0000
commitddd0986311196f389c9b88147620129ec788886e (patch)
tree40997a3e163e580650783a647a1223a5e97c181e /wifi
parent9f6ba7af562a938e4765a224b412f2d0691f586a (diff)
parentcd8e0416687c00a1e8eff525be0925a3f00c08bb (diff)
downloadframeworks_base-ddd0986311196f389c9b88147620129ec788886e.zip
frameworks_base-ddd0986311196f389c9b88147620129ec788886e.tar.gz
frameworks_base-ddd0986311196f389c9b88147620129ec788886e.tar.bz2
Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java5
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 3d976e7..e27bd7e 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1696,7 +1696,6 @@ public class WifiManager {
*
* @hide
*/
- @SystemApi
public void connect(WifiConfiguration config, ActionListener listener) {
if (config == null) throw new IllegalArgumentException("config cannot be null");
validateChannel();
@@ -1719,7 +1718,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();
@@ -1744,7 +1742,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();
@@ -1764,7 +1761,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();
@@ -1780,7 +1776,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();