diff options
| author | Patrik Fimml <patrikf@google.com> | 2019-10-09 17:34:01 +0200 |
|---|---|---|
| committer | Patrik Fimml <patrikf@google.com> | 2019-10-16 16:46:55 +0200 |
| commit | 6beae321c645c559cb64dde0c15f954aaeef3c27 (patch) | |
| tree | 1a6588419cd5bdca8afacc2aaa25bf71cc12b23f /wifi/1.4/default/wifi_feature_flags.cpp | |
| parent | edd2e2b11c14caeba00fb0f084bfe73214c49edf (diff) | |
Wifi AP: Remove HAL-level MAC randomization
Randomization will be handled by framework code instead. This also means
WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION is replaced with a
framework config option (config_wifi_ap_mac_randomization_supported),
which can be set from device overlays.
Bug: 142387520
Test: atest android.hardware.wifi@1.0-service-tests; adb shell LD_LIBRARY_PATH=:/system/lib64/vndk-R /data/local/tmp/android.hardware.wifi@1.0-service-tests/x86_64/android.hardware.wifi@1.0-service-tests
Test: vts-tradefed run vts --primary-abi-only --skip-device-info -l DEBUG --include-filter VtsHalWifiApV1_4Target
Test: lunch hawk-userdebug; m (uses DISABLE_AP_MAC_RANDOMIZATION)
Change-Id: I2dbf1158368ce3c39980501f892c6de1ffb3f748
Diffstat (limited to 'wifi/1.4/default/wifi_feature_flags.cpp')
| -rw-r--r-- | wifi/1.4/default/wifi_feature_flags.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/wifi/1.4/default/wifi_feature_flags.cpp b/wifi/1.4/default/wifi_feature_flags.cpp index f9746eb076..195b460dfe 100644 --- a/wifi/1.4/default/wifi_feature_flags.cpp +++ b/wifi/1.4/default/wifi_feature_flags.cpp @@ -145,10 +145,12 @@ static const std::vector<IWifiChip::ChipMode> kChipModes{ #undef NAN #ifdef WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION -static const bool wifiHidlFeatureDisableApMacRandomization = true; -#else -static const bool wifiHidlFeatureDisableApMacRandomization = false; -#endif // WIFI_HIDL_FEATURE_DISABLE_AP +#pragma message \ + "WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION is deprecated; override " \ + "'config_wifi_ap_randomization_supported' in " \ + "frameworks/base/core/res/res/values/config.xml in the device overlay " \ + "instead" +#endif // WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION WifiFeatureFlags::WifiFeatureFlags() {} @@ -156,10 +158,6 @@ std::vector<IWifiChip::ChipMode> WifiFeatureFlags::getChipModes() { return kChipModes; } -bool WifiFeatureFlags::isApMacRandomizationDisabled() { - return wifiHidlFeatureDisableApMacRandomization; -} - } // namespace feature_flags } // namespace implementation } // namespace V1_4 |