commit ddd0986311196f389c9b88147620129ec788886e
author Wenchao Tong <tongwenchao@google.com> Thu Aug 21 16:04:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 21 16:05:00 2014 +0000
tree 40997a3e163e580650783a647a1223a5e97c181e
parent 9f6ba7af562a938e4765a224b412f2d0691f586a
parent cd8e0416687c00a1e8eff525be0925a3f00c08bb

Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev

wifi/java/android/net/wifi/WifiManager.java

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 @@
      *
      * @hide
      */
-    @SystemApi
     public void connect(WifiConfiguration config, ActionListener listener) {
         if (config == null) throw new IllegalArgumentException("config cannot be null");
         validateChannel();
@@ -1719,7 +1718,6 @@
      * 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 @@
      * 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 @@
      * 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 @@
      * initialized again
      * @hide
      */
-    @SystemApi
     public void disable(int netId, ActionListener listener) {
         if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");
         validateChannel();