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

Commit f0984392 authored by Les Lee's avatar Les Lee
Browse files

Revert "Deprecate WpsInfo" 

This reverts commit 7bccf2f9.

Reason for revert:
It is necessary for P2p connection.
Application need to update WpsInfo in WifiP2pConfig when trigger p2p connection
API:
public void connect(Channel c, WifiP2pConfig config, ActionListener listener) {

Bug: 80105789
Test: compile, run ./frameworks/base/wifi/tests/runtests.sh
Change-Id: I0c881627eaee7a7313db6b9805dd6cdb03547df0
parent 60e88ecd

api/current.txt

+14 −15
Original line number Diff line number Diff line
@@ -29689,21 +29689,20 @@ package android.net.wifi { 
    field public static final android.os.Parcelable.Creator<android.net.wifi.WifiNetworkSuggestion> CREATOR;

  }













  public deprecated class WpsInfo implements android.os.Parcelable {













    ctor public deprecated WpsInfo();













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













    method public deprecated int describeContents();













    method public deprecated java.lang.String toString();













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













    field public deprecated java.lang.String BSSID;













    field public static final deprecated android.os.Parcelable.Creator<android.net.wifi.WpsInfo> CREATOR;













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













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













    field public static final deprecated int KEYPAD = 2; // 0x2













    field public static final deprecated int LABEL = 3; // 0x3













    field public static final deprecated int PBC = 0; // 0x0













    field public deprecated java.lang.String pin;













    field public deprecated int setup;













  public class WpsInfo implements android.os.Parcelable {













    ctor public WpsInfo();













    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<android.net.wifi.WpsInfo> CREATOR;













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













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













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













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













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













    field public java.lang.String pin;













    field public int setup;















  }





























}

























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



+14
−47




























Original line number
Diff line number
Diff line








@@ -16,63 +16,42 @@





























package android.net.wifi;





























import android.os.Parcelable;















import android.os.Parcel;













import android.os.Parcelable;































/**















 * A class representing Wi-Fi Protected Setup













 * @deprecated This class is no longer supported.













 *















 * {@see WifiP2pConfig}















 */













@Deprecated















public class WpsInfo implements Parcelable {





























    /** Push button configuration













     * @deprecated This is no longer supported.*/













    @Deprecated













    /** Push button configuration */















    public static final int PBC     = 0;













    /** Display pin method configuration - pin is generated and displayed on device













     * @deprecated This is no longer supported.*/













    @Deprecated













    /** Display pin method configuration - pin is generated and displayed on device */















    public static final int DISPLAY = 1;













    /** Keypad pin method configuration - pin is entered on device













     * @deprecated This is no longer supported.*/













    @Deprecated













    /** Keypad pin method configuration - pin is entered on device */















    public static final int KEYPAD  = 2;













    /** Label pin method configuration - pin is labelled on device













     * @deprecated This is no longer supported.*/













    @Deprecated













    /** Label pin method configuration - pin is labelled on device */















    public static final int LABEL   = 3;













    /** Invalid configuration













     * @deprecated This is no longer supported.*/













    @Deprecated













    /** Invalid configuration */















    public static final int INVALID = 4;





























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













     * @deprecated This is no longer supported.*/













    @Deprecated













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















    public int setup;





























    /** Passed with pin method KEYPAD













     * @deprecated This is no longer supported.*/













    @Deprecated













    /** Passed with pin method KEYPAD */















    public String BSSID;





























    /** Passed with pin method configuration













     * @deprecated This is no longer supported.*/













    @Deprecated













    /** Passed with pin method configuration */















    public String pin;





























    /** @deprecated This API is no longer supported.*/













    @Deprecated















    public WpsInfo() {















        setup = INVALID;















        BSSID = null;















        pin = null;















    }





























    /** @deprecated This API is no longer supported.*/













    @Deprecated















    public String toString() {















        StringBuffer sbuf = new StringBuffer();















        sbuf.append(" setup: ").append(setup);









@@ -84,16 +63,12 @@ public class WpsInfo implements Parcelable {













        return sbuf.toString();















    }





























    /** Implement the Parcelable interface













     * @deprecated This API is no longer supported.*/













    @Deprecated













    /** Implement the Parcelable interface */















    public int describeContents() {















        return 0;















    }





























    /* Copy constructor













    * @deprecated This API is no longer supported.*/













    @Deprecated













    /* Copy constructor */















    public WpsInfo(WpsInfo source) {















        if (source != null) {















            setup = source.setup;









@@ -102,22 +77,16 @@ public class WpsInfo implements Parcelable {













        }















    }





























    /** Implement the Parcelable interface













     * @deprecated This API is no longer supported. */













    @Deprecated













    /** Implement the Parcelable interface */















    public void writeToParcel(Parcel dest, int flags) {















        dest.writeInt(setup);















        dest.writeString(BSSID);















        dest.writeString(pin);















    }





























    /** Implement the Parcelable interface













     * @deprecated This API is no longer supported.*/













    @Deprecated













    /** Implement the Parcelable interface */















    public static final Creator<WpsInfo> CREATOR =















        new Creator<WpsInfo>() {













            /** @deprecated This API is nolonger supported.*/













            @Deprecated















            public WpsInfo createFromParcel(Parcel in) {















                WpsInfo config = new WpsInfo();















                config.setup = in.readInt();









@@ -126,8 +95,6 @@ public class WpsInfo implements Parcelable {













                return config;















            }





























            /** @deprecated This API is nolonger supported.*/













            @Deprecated















            public WpsInfo[] newArray(int size) {















                return new WpsInfo[size];















            }