Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e7882f2 authored by Stephen Chen's avatar Stephen Chen Committed by android-build-merger
Browse files

Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 

am: 691ebe53

Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
parents 301c714b 691ebe53

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -27035,6 +27035,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);
@@ -27134,6 +27135,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();

























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



+2
−0




























Original line number
Diff line number
Diff line








@@ -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