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

Commit ec814a10 authored by Sunil Ravi's avatar Sunil Ravi
Browse files

Rx Link speed Information 

Get Rx link speed and save it in WifiInfo.
Expose the API to get Rx link speed and Tx
link speed

Bug: 118820339
Test: Manual test by connecting to AP and checking
rx link speed print in logcat logs.

Change-Id: I35245d846533069f2c6b0fa70c6eb94bccb6365c
parent 87af16bc

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -29560,8 +29560,10 @@ package android.net.wifi { 
    method public java.lang.String getMacAddress();

    method public int getNetworkId();

    method public int getRssi();

    method public int getRxLinkSpeedMbps();

    method public java.lang.String getSSID();

    method public android.net.wifi.SupplicantState getSupplicantState();

    method public int getTxLinkSpeedMbps();

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

    field public static final java.lang.String FREQUENCY_UNITS = "MHz";

    field public static final java.lang.String LINK_SPEED_UNITS = "Mbps";

wifi/java/android/net/wifi/WifiInfo.java

+66 −14
Original line number Diff line number Diff line
@@ -93,11 +93,21 @@ public class WifiInfo implements Parcelable { 
    private int mRssi;



    /**

     * Link speed in Mbps

     * The unit in which links speeds are expressed.

     */

    public static final String LINK_SPEED_UNITS = "Mbps";

    private int mLinkSpeed;



    /**

     * Tx(transmit) Link speed in Mbps

     */

    private int mTxLinkSpeed;



    /**

     * Rx(receive) Link speed in Mbps

     */

    private int mRxLinkSpeed;



    /**

     * Frequency in MHz

     */
@@ -192,6 +202,8 @@ public class WifiInfo implements Parcelable { 
        setNetworkId(-1);

        setRssi(INVALID_RSSI);

        setLinkSpeed(-1);

        setTxLinkSpeedMbps(-1);

        setRxLinkSpeedMbps(-1);

        setFrequency(-1);

        setMeteredHint(false);

        setEphemeral(false);
@@ -219,6 +231,8 @@ public class WifiInfo implements Parcelable { 
            mNetworkId = source.mNetworkId;

            mRssi = source.mRssi;

            mLinkSpeed = source.mLinkSpeed;

            mTxLinkSpeed = source.mTxLinkSpeed;

            mRxLinkSpeed = source.mRxLinkSpeed;

            mFrequency = source.mFrequency;

            mIpAddress = source.mIpAddress;

            mMacAddress = source.mMacAddress;
@@ -313,7 +327,7 @@ public class WifiInfo implements Parcelable { 


    /**

     * Returns the current link speed in {@link #LINK_SPEED_UNITS}.

     * @return the link speed.

     * @return the link speed or -1 if there is no valid value.

     * @see #LINK_SPEED_UNITS

     */

    public int getLinkSpeed() {
@@ -323,7 +337,39 @@ public class WifiInfo implements Parcelable { 
    /** @hide */

    @UnsupportedAppUsage

    public void setLinkSpeed(int linkSpeed) {

        this.mLinkSpeed = linkSpeed;

        mLinkSpeed = linkSpeed;

    }



    /**

     * Returns the current transmit link speed in Mbps.

     * @return the Tx link speed or -1 if there is no valid value.

     */

    public int getTxLinkSpeedMbps() {

        return mTxLinkSpeed;

    }



    /**

     * Update the last transmitted packet bit rate in Mbps.

     * @hide

     */

    public void setTxLinkSpeedMbps(int txLinkSpeed) {

        mTxLinkSpeed = txLinkSpeed;

    }



    /**

     * Returns the current receive link speed in Mbps.

     * @return the Rx link speed or -1 if there is no valid value.

     */

    public int getRxLinkSpeedMbps() {

        return mRxLinkSpeed;

    }



    /**

     * Update the last received packet bit rate in Mbps.

     * @hide

     */

    public void setRxLinkSpeedMbps(int rxLinkSpeed) {

        mRxLinkSpeed = rxLinkSpeed;

    }



    /**
@@ -529,17 +575,19 @@ public class WifiInfo implements Parcelable { 
        StringBuffer sb = new StringBuffer();

        String none = "<none>";



        sb.append("SSID: ").append(mWifiSsid == null ? WifiSsid.NONE : mWifiSsid).

            append(", BSSID: ").append(mBSSID == null ? none : mBSSID).

            append(", MAC: ").append(mMacAddress == null ? none : mMacAddress).

            append(", Supplicant state: ").

            append(mSupplicantState == null ? none : mSupplicantState).

            append(", RSSI: ").append(mRssi).

            append(", Link speed: ").append(mLinkSpeed).append(LINK_SPEED_UNITS).

            append(", Frequency: ").append(mFrequency).append(FREQUENCY_UNITS).

            append(", Net ID: ").append(mNetworkId).

            append(", Metered hint: ").append(mMeteredHint).

            append(", score: ").append(Integer.toString(score));

        sb.append("SSID: ").append(mWifiSsid == null ? WifiSsid.NONE : mWifiSsid)

                .append(", BSSID: ").append(mBSSID == null ? none : mBSSID)

                .append(", MAC: ").append(mMacAddress == null ? none : mMacAddress)

                .append(", Supplicant state: ")

                .append(mSupplicantState == null ? none : mSupplicantState)

                .append(", RSSI: ").append(mRssi)

                .append(", Link speed: ").append(mLinkSpeed).append(LINK_SPEED_UNITS)

                .append(", Tx Link speed: ").append(mTxLinkSpeed).append(LINK_SPEED_UNITS)

                .append(", Rx Link speed: ").append(mRxLinkSpeed).append(LINK_SPEED_UNITS)

                .append(", Frequency: ").append(mFrequency).append(FREQUENCY_UNITS)

                .append(", Net ID: ").append(mNetworkId)

                .append(", Metered hint: ").append(mMeteredHint)

                .append(", score: ").append(Integer.toString(score));

        return sb.toString();

    }
@@ -553,6 +601,8 @@ public class WifiInfo implements Parcelable { 
        dest.writeInt(mNetworkId);

        dest.writeInt(mRssi);

        dest.writeInt(mLinkSpeed);

        dest.writeInt(mTxLinkSpeed);

        dest.writeInt(mRxLinkSpeed);

        dest.writeInt(mFrequency);

        if (mIpAddress != null) {

            dest.writeByte((byte)1);
@@ -593,6 +643,8 @@ public class WifiInfo implements Parcelable { 
                info.setNetworkId(in.readInt());

                info.setRssi(in.readInt());

                info.setLinkSpeed(in.readInt());

                info.setTxLinkSpeedMbps(in.readInt());

                info.setRxLinkSpeedMbps(in.readInt());

                info.setFrequency(in.readInt());

                if (in.readByte() == 1) {

                    try {