Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366

Browse Source 
am: 0e7882f2ac

Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7
This commit is contained in:
Stephen Chen
2017-01-12 07:27:22 +00:00
committed by android-build-merger
parent dcb0c55c15 0e7882f2ac
commit 272e70bf69
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/system-current.txt
View File

@@ -27035,6 +27035,7 @@ package android.net.wifi {
method public static int calculateSignalLevel(int, int); method public static int calculateSignalLevel(int, int);
method public void cancelWps(android.net.wifi.WifiManager.WpsCallback); method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
method public static int compareSignalLevel(int, int); 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.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(int, java.lang.String);
method public android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String); method public android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String);
@@ -27134,6 +27135,11 @@ package android.net.wifi {
field public static final int WPS_WEP_PROHIBITED = 4; // 0x4 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 { public class WifiManager.MulticastLock {
method public void acquire(); method public void acquire();
method public boolean isHeld(); method public boolean isHeld();

2
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -1765,6 +1765,7 @@ public class WifiManager {
* Interface for callback invocation on an application action * Interface for callback invocation on an application action
* @hide * @hide
*/ */
@SystemApi
public interface ActionListener { public interface ActionListener {
/** The operation succeeded */ /** The operation succeeded */
public void onSuccess(); public void onSuccess();
@@ -1976,6 +1977,7 @@ public class WifiManager {
* *
* @hide * @hide
*/ */
@SystemApi
public void connect(WifiConfiguration config, ActionListener listener) { public void connect(WifiConfiguration config, ActionListener listener) {
if (config == null) throw new IllegalArgumentException("config cannot be null"); if (config == null) throw new IllegalArgumentException("config cannot be null");
// Use INVALID_NETWORK_ID for arg1 when passing a config object // Use INVALID_NETWORK_ID for arg1 when passing a config object