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

Commit a04b2b5f authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

Remove ability to set frequency from WifiAssociationTest am: 93ce6376

am: 4bec7b53

Change-Id: I53df1fdc9bd9fb748756a5b75d9cf0063d9e443c
parents af51ffe8 4bec7b53
Loading
Loading
Loading
Loading
+0 −27
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ public class WifiAssociationTest extends ConnectivityManagerTestBase {

        String password = arguments.getString("password");

        String freqStr = arguments.getString("frequency-band");
        if (freqStr != null) {
            setFrequencyBand(freqStr);
        }

        assertTrue("enable Wifi failed", enableWifi());
        WifiInfo wi = mWifiManager.getConnectionInfo();
        logv("%s", wi);
@@ -79,28 +74,6 @@ public class WifiAssociationTest extends ConnectivityManagerTestBase {
        connectToWifi(config);
    }

    /**
     * Set the frequency band and verify that it has been set.
     */
    private void setFrequencyBand(String frequencyBandStr) {
        int frequencyBand = -1;
        if ("2.4".equals(frequencyBandStr)) {
            frequencyBand = WifiManager.WIFI_FREQUENCY_BAND_2GHZ;
        } else if ("5.0".equals(frequencyBandStr)) {
            frequencyBand = WifiManager.WIFI_FREQUENCY_BAND_5GHZ;
        } else if ("auto".equals(frequencyBandStr)) {
            frequencyBand = WifiManager.WIFI_FREQUENCY_BAND_AUTO;
        } else {
            fail("Invalid frequency-band");
        }
        if (mWifiManager.getFrequencyBand() != frequencyBand) {
            logv("Set frequency band to %s", frequencyBandStr);
            mWifiManager.setFrequencyBand(frequencyBand, true);
        }
        assertEquals("Specified frequency band does not match operational band",
                frequencyBand, mWifiManager.getFrequencyBand());
    }

    /**
     * Get the {@link WifiConfiguration} based on ssid, security, and password.
     */