diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiApIface.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiApIface.aidl index a102b9779d..e71dde40fd 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiApIface.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiApIface.aidl @@ -38,7 +38,6 @@ interface IWifiApIface { String[] getBridgedInstances(); byte[6] getFactoryMacAddress(); void setCountryCode(in byte[2] code); - int[] getValidFrequenciesForBand(in android.hardware.wifi.WifiBand band); void resetToFactoryMacAddress(); void setMacAddress(in byte[6] mac); } diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl index 31b6881fa9..4b1fb5f8a1 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl @@ -47,7 +47,6 @@ interface IWifiStaIface { byte[6] getFactoryMacAddress(); android.hardware.wifi.StaLinkLayerStats getLinkLayerStats(); android.hardware.wifi.StaRoamingCapabilities getRoamingCapabilities(); - int[] getValidFrequenciesForBand(in android.hardware.wifi.WifiBand band); void installApfPacketFilter(in byte[] program); byte[] readApfPacketFilterData(); void registerEventCallback(in android.hardware.wifi.IWifiStaIfaceEventCallback callback); diff --git a/wifi/aidl/android/hardware/wifi/IWifiApIface.aidl b/wifi/aidl/android/hardware/wifi/IWifiApIface.aidl index 71ea385a3e..b14a8005b5 100644 --- a/wifi/aidl/android/hardware/wifi/IWifiApIface.aidl +++ b/wifi/aidl/android/hardware/wifi/IWifiApIface.aidl @@ -67,20 +67,6 @@ interface IWifiApIface { */ void setCountryCode(in byte[2] code); - /** - * Used to query the list of valid frequencies (depending on country code set) - * for the provided band. - * - * @param band Band for which the frequency list is being generated. - * @return Vector of valid frequencies for the provided band. - * @throws ServiceSpecificException with one of the following values: - * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|, - * |WifiStatusCode.ERROR_NOT_SUPPORTED|, - * |WifiStatusCode.ERROR_NOT_AVAILABLE|, - * |WifiStatusCode.ERROR_UNKNOWN| - */ - int[] getValidFrequenciesForBand(in WifiBand band); - /** * Reset all of the AP interfaces' MAC address to the factory MAC address. * diff --git a/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl b/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl index 28d6a4dfb6..fd239a7712 100644 --- a/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl +++ b/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl @@ -287,22 +287,6 @@ interface IWifiStaIface { */ StaRoamingCapabilities getRoamingCapabilities(); - /** - * Used to query the list of valid frequencies (depending on the country - * code set) for the provided band. These channels may be specified in the - * |BackgroundScanBucketParameters.frequenciesInMhz| for a background scan - * request. - * - * @param band Band for which the frequency list is being generated. - * @return Vector of valid frequencies for the provided band. - * @throws ServiceSpecificException with one of the following values: - * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|, - * |WifiStatusCode.ERROR_NOT_SUPPORTED|, - * |WifiStatusCode.ERROR_NOT_AVAILABLE|, - * |WifiStatusCode.ERROR_UNKNOWN| - */ - int[] getValidFrequenciesForBand(in WifiBand band); - /** * Installs an APF program on this iface, replacing an existing * program if present. diff --git a/wifi/aidl/default/wifi_ap_iface.cpp b/wifi/aidl/default/wifi_ap_iface.cpp index 6cd932df41..77797502d3 100644 --- a/wifi/aidl/default/wifi_ap_iface.cpp +++ b/wifi/aidl/default/wifi_ap_iface.cpp @@ -64,12 +64,6 @@ ndk::ScopedAStatus WifiApIface::setCountryCode(const std::array& in_ &WifiApIface::setCountryCodeInternal, in_code); } -ndk::ScopedAStatus WifiApIface::getValidFrequenciesForBand(WifiBand in_band, - std::vector* _aidl_return) { - return validateAndCall(this, WifiStatusCode::ERROR_WIFI_IFACE_INVALID, - &WifiApIface::getValidFrequenciesForBandInternal, _aidl_return, in_band); -} - ndk::ScopedAStatus WifiApIface::setMacAddress(const std::array& in_mac) { return validateAndCall(this, WifiStatusCode::ERROR_WIFI_IFACE_INVALID, &WifiApIface::setMacAddressInternal, in_mac); @@ -101,18 +95,6 @@ ndk::ScopedAStatus WifiApIface::setCountryCodeInternal(const std::array, ndk::ScopedAStatus> WifiApIface::getValidFrequenciesForBandInternal( - WifiBand band) { - static_assert(sizeof(WifiChannelWidthInMhz) == sizeof(int32_t), "Size mismatch"); - legacy_hal::wifi_error legacy_status; - std::vector valid_frequencies; - std::tie(legacy_status, valid_frequencies) = legacy_hal_.lock()->getValidFrequenciesForBand( - instances_.size() > 0 ? instances_[0] : ifname_, - aidl_struct_util::convertAidlWifiBandToLegacy(band)); - return {std::vector(valid_frequencies.begin(), valid_frequencies.end()), - createWifiStatusFromLegacyError(legacy_status)}; -} - ndk::ScopedAStatus WifiApIface::setMacAddressInternal(const std::array& mac) { // Support random MAC up to 2 interfaces if (instances_.size() == 2) { diff --git a/wifi/aidl/default/wifi_ap_iface.h b/wifi/aidl/default/wifi_ap_iface.h index b5673fcaac..7378f98acf 100644 --- a/wifi/aidl/default/wifi_ap_iface.h +++ b/wifi/aidl/default/wifi_ap_iface.h @@ -45,8 +45,6 @@ class WifiApIface : public BnWifiApIface { // AIDL methods exposed. ndk::ScopedAStatus getName(std::string* _aidl_return) override; ndk::ScopedAStatus setCountryCode(const std::array& in_code) override; - ndk::ScopedAStatus getValidFrequenciesForBand(WifiBand in_band, - std::vector* _aidl_return) override; ndk::ScopedAStatus setMacAddress(const std::array& in_mac) override; ndk::ScopedAStatus getFactoryMacAddress(std::array* _aidl_return) override; ndk::ScopedAStatus resetToFactoryMacAddress() override; @@ -56,8 +54,6 @@ class WifiApIface : public BnWifiApIface { // Corresponding worker functions for the AIDL methods. std::pair getNameInternal(); ndk::ScopedAStatus setCountryCodeInternal(const std::array& code); - std::pair, ndk::ScopedAStatus> getValidFrequenciesForBandInternal( - WifiBand band); ndk::ScopedAStatus setMacAddressInternal(const std::array& mac); std::pair, ndk::ScopedAStatus> getFactoryMacAddressInternal( const std::string& ifaceName); diff --git a/wifi/aidl/default/wifi_sta_iface.cpp b/wifi/aidl/default/wifi_sta_iface.cpp index 300316aa07..ed7510a1c5 100644 --- a/wifi/aidl/default/wifi_sta_iface.cpp +++ b/wifi/aidl/default/wifi_sta_iface.cpp @@ -110,13 +110,6 @@ ndk::ScopedAStatus WifiStaIface::getBackgroundScanCapabilities( &WifiStaIface::getBackgroundScanCapabilitiesInternal, _aidl_return); } -ndk::ScopedAStatus WifiStaIface::getValidFrequenciesForBand(WifiBand in_band, - std::vector* _aidl_return) { - return validateAndCall(this, WifiStatusCode::ERROR_WIFI_IFACE_INVALID, - &WifiStaIface::getValidFrequenciesForBandInternal, _aidl_return, - in_band); -} - ndk::ScopedAStatus WifiStaIface::startBackgroundScan(int32_t in_cmdId, const StaBackgroundScanParameters& in_params) { return validateAndCall(this, WifiStatusCode::ERROR_WIFI_IFACE_INVALID, @@ -303,17 +296,6 @@ WifiStaIface::getBackgroundScanCapabilitiesInternal() { return {aidl_caps, ndk::ScopedAStatus::ok()}; } -std::pair, ndk::ScopedAStatus> -WifiStaIface::getValidFrequenciesForBandInternal(WifiBand band) { - static_assert(sizeof(WifiChannelWidthInMhz) == sizeof(int32_t), "Size mismatch"); - legacy_hal::wifi_error legacy_status; - std::vector valid_frequencies; - std::tie(legacy_status, valid_frequencies) = legacy_hal_.lock()->getValidFrequenciesForBand( - ifname_, aidl_struct_util::convertAidlWifiBandToLegacy(band)); - return {std::vector(valid_frequencies.begin(), valid_frequencies.end()), - createWifiStatusFromLegacyError(legacy_status)}; -} - ndk::ScopedAStatus WifiStaIface::startBackgroundScanInternal( int32_t cmd_id, const StaBackgroundScanParameters& params) { legacy_hal::wifi_scan_cmd_params legacy_params; diff --git a/wifi/aidl/default/wifi_sta_iface.h b/wifi/aidl/default/wifi_sta_iface.h index 2e4403ad7e..0c8f3e0e9d 100644 --- a/wifi/aidl/default/wifi_sta_iface.h +++ b/wifi/aidl/default/wifi_sta_iface.h @@ -62,8 +62,6 @@ class WifiStaIface : public BnWifiStaIface { ndk::ScopedAStatus readApfPacketFilterData(std::vector* _aidl_return) override; ndk::ScopedAStatus getBackgroundScanCapabilities( StaBackgroundScanCapabilities* _aidl_return) override; - ndk::ScopedAStatus getValidFrequenciesForBand(WifiBand in_band, - std::vector* _aidl_return) override; ndk::ScopedAStatus startBackgroundScan(int32_t in_cmdId, const StaBackgroundScanParameters& in_params) override; ndk::ScopedAStatus stopBackgroundScan(int32_t in_cmdId) override; @@ -106,8 +104,6 @@ class WifiStaIface : public BnWifiStaIface { std::pair, ndk::ScopedAStatus> readApfPacketFilterDataInternal(); std::pair getBackgroundScanCapabilitiesInternal(); - std::pair, ndk::ScopedAStatus> getValidFrequenciesForBandInternal( - WifiBand band); ndk::ScopedAStatus startBackgroundScanInternal(int32_t cmd_id, const StaBackgroundScanParameters& params); ndk::ScopedAStatus stopBackgroundScanInternal(int32_t cmd_id); diff --git a/wifi/aidl/vts/functional/wifi_ap_iface_aidl_test.cpp b/wifi/aidl/vts/functional/wifi_ap_iface_aidl_test.cpp index 0eaf660d49..d39cfb4f93 100644 --- a/wifi/aidl/vts/functional/wifi_ap_iface_aidl_test.cpp +++ b/wifi/aidl/vts/functional/wifi_ap_iface_aidl_test.cpp @@ -67,19 +67,6 @@ TEST_P(WifiApIfaceAidlTest, SetCountryCode) { EXPECT_TRUE(wifi_ap_iface->setCountryCode(country_code).isOk()); } -/* - * GetValidFrequenciesForBand - * Ensures that we can retrieve valid frequencies for the 2.4 GHz band. - */ -TEST_P(WifiApIfaceAidlTest, GetValidFrequenciesForBand) { - std::shared_ptr wifi_ap_iface = getWifiApIface(getInstanceName()); - ASSERT_NE(nullptr, wifi_ap_iface.get()); - - std::vector freqs; - EXPECT_TRUE(wifi_ap_iface->getValidFrequenciesForBand(WifiBand::BAND_24GHZ, &freqs).isOk()); - EXPECT_NE(freqs.size(), 0); -} - /* * GetFactoryMacAddress */ diff --git a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp index fe32be55c9..c968cd57bf 100644 --- a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp +++ b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp @@ -113,16 +113,6 @@ TEST_P(WifiStaIfaceAidlTest, GetBackgroundScanCapabilities) { EXPECT_TRUE(wifi_sta_iface_->getBackgroundScanCapabilities(&caps).isOk()); } -/* - * GetValidFrequenciesForBand - * Ensures that we can retrieve valid frequencies for the 2.4 GHz band. - */ -TEST_P(WifiStaIfaceAidlTest, GetValidFrequenciesForBand) { - std::vector freqs; - EXPECT_TRUE(wifi_sta_iface_->getValidFrequenciesForBand(WifiBand::BAND_24GHZ, &freqs).isOk()); - EXPECT_NE(freqs.size(), 0); -} - /* * GetLinkLayerStats * Ensures that calls to getLinkLayerStats will retrieve a non-empty