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

Commit 97f25c93 authored by Steven Liu's avatar Steven Liu
Browse files

Remove legacy "Carrier Wi-Fi" configuration constants. 

They are deprecated and replaced by direct calls to the Suggestion API.

Bug: 144431927
Test: atest android.net.wifi
Change-Id: I89665bc3e891b3a0fb58be10ccb1642ec121e29b
parent 8a6c2bf3

wifi/java/android/net/wifi/ScanResult.java

+0 −46
Original line number Diff line number Diff line
@@ -695,31 +695,6 @@ public class ScanResult implements Parcelable { 
     */

    public AnqpInformationElement[] anqpElements;



    /**

     * Flag indicating if this AP is a carrier AP. The determination is based

     * on the AP's SSID and if AP is using EAP security.

     *

     * @hide

     */

    // TODO(b/144431927): remove once migrated to Suggestions

    public boolean isCarrierAp;



    /**

     * The EAP type {@link WifiEnterpriseConfig.Eap} associated with this AP if it is a carrier AP.

     *

     * @hide

     */

    // TODO(b/144431927): remove once migrated to Suggestions

    public int carrierApEapType;



    /**

     * The name of the carrier that's associated with this AP if it is a carrier AP.

     *

     * @hide

     */

    // TODO(b/144431927): remove once migrated to Suggestions

    public String carrierName;



    /** {@hide} */

    public ScanResult(WifiSsid wifiSsid, String BSSID, long hessid, int anqpDomainId,

            byte[] osuProviders, String caps, int level, int frequency, long tsf) {
@@ -744,9 +719,6 @@ public class ScanResult implements Parcelable { 
        this.centerFreq0 = UNSPECIFIED;

        this.centerFreq1 = UNSPECIFIED;

        this.flags = 0;

        this.isCarrierAp = false;

        this.carrierApEapType = UNSPECIFIED;

        this.carrierName = null;

        this.radioChainInfos = null;

        this.mWifiStandard = WIFI_STANDARD_UNKNOWN;

    }
@@ -767,9 +739,6 @@ public class ScanResult implements Parcelable { 
        this.centerFreq0 = UNSPECIFIED;

        this.centerFreq1 = UNSPECIFIED;

        this.flags = 0;

        this.isCarrierAp = false;

        this.carrierApEapType = UNSPECIFIED;

        this.carrierName = null;

        this.radioChainInfos = null;

        this.mWifiStandard = WIFI_STANDARD_UNKNOWN;

    }
@@ -797,9 +766,6 @@ public class ScanResult implements Parcelable { 
        } else {

            this.flags = 0;

        }

        this.isCarrierAp = false;

        this.carrierApEapType = UNSPECIFIED;

        this.carrierName = null;

        this.radioChainInfos = null;

        this.mWifiStandard = WIFI_STANDARD_UNKNOWN;

    }
@@ -839,9 +805,6 @@ public class ScanResult implements Parcelable { 
            venueName = source.venueName;

            operatorFriendlyName = source.operatorFriendlyName;

            flags = source.flags;

            isCarrierAp = source.isCarrierAp;

            carrierApEapType = source.carrierApEapType;

            carrierName = source.carrierName;

            radioChainInfos = source.radioChainInfos;

            this.mWifiStandard = source.mWifiStandard;

        }
@@ -881,9 +844,6 @@ public class ScanResult implements Parcelable { 
        sb.append(", standard: ").append(wifiStandardToString(mWifiStandard));

        sb.append(", 80211mcResponder: ");

        sb.append(((flags & FLAG_80211mc_RESPONDER) != 0) ? "is supported" : "is not supported");

        sb.append(", Carrier AP: ").append(isCarrierAp ? "yes" : "no");

        sb.append(", Carrier AP EAP Type: ").append(carrierApEapType);

        sb.append(", Carrier name: ").append(carrierName);

        sb.append(", Radio Chain Infos: ").append(Arrays.toString(radioChainInfos));

        return sb.toString();

    }
@@ -954,9 +914,6 @@ public class ScanResult implements Parcelable { 
        } else {

            dest.writeInt(0);

        }

        dest.writeInt(isCarrierAp ? 1 : 0);

        dest.writeInt(carrierApEapType);

        dest.writeString(carrierName);



        if (radioChainInfos != null) {

            dest.writeInt(radioChainInfos.length);
@@ -1036,9 +993,6 @@ public class ScanResult implements Parcelable { 
                                new AnqpInformationElement(vendorId, elementId, payload);

                    }

                }

                sr.isCarrierAp = in.readInt() != 0;

                sr.carrierApEapType = in.readInt();

                sr.carrierName = in.readString();

                n = in.readInt();

                if (n != 0) {

                    sr.radioChainInfos = new RadioChainInfo[n];

wifi/tests/src/android/net/wifi/ScanResultTest.java

+2 −4
Original line number Diff line number Diff line
@@ -156,8 +156,7 @@ public class ScanResultTest { 
                + "distance: 0(cm), distanceSd: 0(cm), "

                + "passpoint: no, ChannelBandwidth: 0, centerFreq0: 0, centerFreq1: 0, "

                + "standard: 11ac, "

                + "80211mcResponder: is not supported, Carrier AP: no, "

                + "Carrier AP EAP Type: 0, Carrier name: null, "

                + "80211mcResponder: is not supported, "

                + "Radio Chain Infos: null", scanResult.toString());

    }
@@ -179,8 +178,7 @@ public class ScanResultTest { 
                + "distanceSd: 0(cm), "

                + "passpoint: no, ChannelBandwidth: 0, centerFreq0: 0, centerFreq1: 0, "

                + "standard: 11ac, "

                + "80211mcResponder: is not supported, Carrier AP: no, "

                + "Carrier AP EAP Type: 0, Carrier name: null, "

                + "80211mcResponder: is not supported, "

                + "Radio Chain Infos: [RadioChainInfo: id=0, level=-45, "

                + "RadioChainInfo: id=1, level=-54]", scanResult.toString());

    }