summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stephen Chen <stewchen@google.com> 2017-01-06 15:34:28 -0800
committer Stephen Chen <stewchen@google.com> 2017-01-06 15:34:28 -0800
commit32f73c0f4ef6a767e1f3bcc0ff7bcff4fe5ee9c9 (patch)
treef299c650828911b1f550435643c07492e621979d
parent51d34bf06aa67ab5b29c5541e777505ad37907d0 (diff)
Expose WifiManager#connect and ActionListener as @SystemApi
This is needed by Wifi Wakeup and Notifications which live within NetworkRecommendation package. Bug: 33224871 Test: GTS Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
-rw-r--r--api/system-current.txt6
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java2
2 files changed, 8 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 7a0f24c3c9f9..c399c747f801 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -27451,6 +27451,7 @@ package android.net.wifi {
method public static int calculateSignalLevel(int, int);
method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
method public static int compareSignalLevel(int, int);
+ method public void connect(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);
method public android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String);
method public android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String);
method public android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String);
@@ -27550,6 +27551,11 @@ package android.net.wifi {
field public static final int WPS_WEP_PROHIBITED = 4; // 0x4
}
+ public static abstract interface WifiManager.ActionListener {
+ method public abstract void onFailure(int);
+ method public abstract void onSuccess();
+ }
+
public class WifiManager.MulticastLock {
method public void acquire();
method public boolean isHeld();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 674c16156cc8..70f31eef2249 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1763,6 +1763,7 @@ public class WifiManager {
* Interface for callback invocation on an application action
* @hide
*/
+ @SystemApi
public interface ActionListener {
/** The operation succeeded */
public void onSuccess();
@@ -1974,6 +1975,7 @@ public class WifiManager {
*
* @hide
*/
+ @SystemApi
public void connect(WifiConfiguration config, ActionListener listener) {
if (config == null) throw new IllegalArgumentException("config cannot be null");
// Use INVALID_NETWORK_ID for arg1 when passing a config object