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

Commit c05cb5ff authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Revert "Make Wifi WPS API available on application... 

Merge "DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"" into lmp-preview-dev
parents fc2ae28f 22e2ea67

api/current.txt

+0 −23
Original line number Diff line number Diff line
@@ -17108,7 +17108,6 @@ package android.net.wifi { 
  public class WifiManager {

    method public int addNetwork(android.net.wifi.WifiConfiguration);

    method public static int calculateSignalLevel(int, int);

    method public void cancelWps(android.net.wifi.WifiManager.ActionListener);

    method public static int compareSignalLevel(int, int);

    method public android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String);

    method public android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String);
@@ -17132,12 +17131,9 @@ package android.net.wifi { 
    method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);

    method public boolean setWifiEnabled(boolean);

    method public boolean startScan();

    method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsListener);

    method public int updateNetwork(android.net.wifi.WifiConfiguration);

    field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";

    field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";

    field public static final int BUSY = 2; // 0x2

    field public static final int ERROR = 0; // 0x0

    field public static final int ERROR_AUTHENTICATING = 1; // 0x1

    field public static final java.lang.String EXTRA_BSSID = "bssid";

    field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
@@ -17148,8 +17144,6 @@ package android.net.wifi { 
    field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";

    field public static final java.lang.String EXTRA_WIFI_INFO = "wifiInfo";

    field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_state";

    field public static final int INVALID_ARGS = 8; // 0x8

    field public static final int IN_PROGRESS = 1; // 0x1

    field public static final java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";

    field public static final java.lang.String NETWORK_STATE_CHANGED_ACTION = "android.net.wifi.STATE_CHANGE";

    field public static final java.lang.String RSSI_CHANGED_ACTION = "android.net.wifi.RSSI_CHANGED";
@@ -17165,16 +17159,6 @@ package android.net.wifi { 
    field public static final int WIFI_STATE_ENABLED = 3; // 0x3

    field public static final int WIFI_STATE_ENABLING = 2; // 0x2

    field public static final int WIFI_STATE_UNKNOWN = 4; // 0x4

    field public static final int WPS_AUTH_FAILURE = 6; // 0x6

    field public static final int WPS_OVERLAP_ERROR = 3; // 0x3

    field public static final int WPS_TIMED_OUT = 7; // 0x7

    field public static final int WPS_TKIP_ONLY_PROHIBITED = 5; // 0x5

    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 {









@@ -17192,12 +17176,6 @@ package android.net.wifi {













    method public void setWorkSource(android.os.WorkSource);















  }



























  public static abstract interface WifiManager.WpsListener {













    method public abstract void onCompletion();













    method public abstract void onFailure(int);













    method public abstract void onStartSuccess(java.lang.String);













  }



























  public class WifiScanner {















    method public void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.HotspotInfo[]);















    method public void resetHotlist(android.net.wifi.WifiScanner.HotlistListener);










@@ -17283,7 +17261,6 @@ package android.net.wifi {













    ctor public WpsInfo(android.net.wifi.WpsInfo);















    method public int describeContents();















    method public void writeToParcel(android.os.Parcel, int);













    field public java.lang.String BSSID;















    field public static final android.os.Parcelable.Creator CREATOR;















    field public static final int DISPLAY = 1; // 0x1















    field public static final int INVALID = 4; // 0x4

























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



+13
−7




























Original line number
Diff line number
Diff line








@@ -1413,12 +1413,14 @@ public class WifiManager {













    /**















     * Passed with {@link ActionListener#onFailure}.















     * Indicates that the operation failed due to an internal error.













     * @hide















     */















    public static final int ERROR                       = 0;































    /**















     * Passed with {@link ActionListener#onFailure}.















     * Indicates that the operation is already in progress













     * @hide















     */















    public static final int IN_PROGRESS                 = 1;

























@@ -1426,28 +1428,30 @@ public class WifiManager {













     * Passed with {@link ActionListener#onFailure}.















     * Indicates that the operation failed because the framework is busy and















     * unable to service the request













     * @hide















     */















    public static final int BUSY                        = 2;































    /* WPS specific errors */













    /** WPS overlap detected */













    /** WPS overlap detected {@hide} */















    public static final int WPS_OVERLAP_ERROR           = 3;













    /** WEP on WPS is prohibited */













    /** WEP on WPS is prohibited {@hide} */















    public static final int WPS_WEP_PROHIBITED          = 4;













    /** TKIP only prohibited */













    /** TKIP only prohibited {@hide} */















    public static final int WPS_TKIP_ONLY_PROHIBITED    = 5;













    /** Authentication failure on WPS */













    /** Authentication failure on WPS {@hide} */















    public static final int WPS_AUTH_FAILURE            = 6;













    /** WPS timed out */













    /** WPS timed out {@hide} */















    public static final int WPS_TIMED_OUT               = 7;































    /**















     * Passed with {@link ActionListener#onFailure}.















     * Indicates that the operation failed due to invalid inputs













     * @hide















     */















    public static final int INVALID_ARGS                = 8;





























    /** Interface for callback invocation on an application action */













    /** Interface for callback invocation on an application action {@hide} */















    public interface ActionListener {















        /** The operation succeeded */















        public void onSuccess();









@@ -1459,7 +1463,7 @@ public class WifiManager {













        public void onFailure(int reason);















    }





























    /** Interface for callback invocation on a start WPS action */













    /** Interface for callback invocation on a start WPS action {@hide} */















    public interface WpsListener {















        /** WPS start succeeded */















        public void onStartSuccess(String pin);










@@ -1741,6 +1745,7 @@ public class WifiManager {













     * @param listener for callbacks on success or failure. Can be null.















     * @throws IllegalStateException if the WifiManager instance needs to be















     * initialized again













     * @hide















     */















    public void startWps(WpsInfo config, WpsListener listener) {















        if (config == null) throw new IllegalArgumentException("config cannot be null");









@@ -1754,6 +1759,7 @@ public class WifiManager {













     * @param listener for callbacks on success or failure. Can be null.















     * @throws IllegalStateException if the WifiManager instance needs to be















     * initialized again













     * @hide















     */















    public void cancelWps(ActionListener listener) {















        validateChannel();

































wifi/java/android/net/wifi/WpsInfo.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -40,7 +40,7 @@ public class WpsInfo implements Parcelable {













    /** Wi-Fi Protected Setup. www.wi-fi.org/wifi-protected-setup has details */















    public int setup;





























    /** Passed with pin method KEYPAD */













    /** @hide */















    public String BSSID;































    /** Passed with pin method configuration */