From 93ce63760dd09870d689176ab94db652f578d926 Mon Sep 17 00:00:00 2001 From: Christopher Wiley Date: Tue, 20 Sep 2016 15:33:49 -0700 Subject: [PATCH] Remove ability to set frequency from WifiAssociationTest This is no longer a supported API. Bug: 31148223 Test: This code would no longer compile Change-Id: I2d8ee6a40eda7e0f1a266cb0579aff2e504f29a7 --- .../functional/WifiAssociationTest.java | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java index 68f3179f96c12..23135dd156902 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java @@ -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. */