diff options
| author | 2017-01-09 18:46:11 +0000 | |
|---|---|---|
| committer | 2017-01-09 18:46:14 +0000 | |
| commit | 1fe396f67de519330de708514a9c4262e404f4f3 (patch) | |
| tree | 7b71353d4fe629a3a1306db3953f26e26b2fd9cd | |
| parent | 09ca5f52a02ff33d79bf8e7ff045130d6bd3316c (diff) | |
| parent | 32f73c0f4ef6a767e1f3bcc0ff7bcff4fe5ee9c9 (diff) | |
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
| -rw-r--r-- | api/system-current.txt | 6 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 14a767ba038c..cc1832d6ec68 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -27481,6 +27481,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); @@ -27580,6 +27581,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 618a7192a612..88820cda05bd 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1765,6 +1765,7 @@ public class WifiManager { * Interface for callback invocation on an application action * @hide */ + @SystemApi public interface ActionListener { /** The operation succeeded */ public void onSuccess(); @@ -1976,6 +1977,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 |