commit 6beae321c645c559cb64dde0c15f954aaeef3c27
author Patrik Fimml <patrikf@google.com> Wed Oct 09 17:34:01 2019 +0200
committer Patrik Fimml <patrikf@google.com> Wed Oct 16 16:46:55 2019 +0200
tree 1a6588419cd5bdca8afacc2aaa25bf71cc12b23f
parent edd2e2b11c14caeba00fb0f084bfe73214c49edf

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

wifi/1.4/default/wifi_ap_iface.h

diff --git a/wifi/1.4/default/wifi_ap_iface.h b/wifi/1.4/default/wifi_ap_iface.h
index cb3ed3d..4f3438c 100644
--- a/wifi/1.4/default/wifi_ap_iface.h
+++ b/wifi/1.4/default/wifi_ap_iface.h
@@ -20,7 +20,6 @@
 #include <android-base/macros.h>
 #include <android/hardware/wifi/1.4/IWifiApIface.h>
 
-#include "wifi_feature_flags.h"
 #include "wifi_iface_util.h"
 #include "wifi_legacy_hal.h"
 
@@ -36,11 +35,9 @@
  */
 class WifiApIface : public V1_4::IWifiApIface {
    public:
-    WifiApIface(
-        const std::string& ifname,
-        const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal,
-        const std::weak_ptr<iface_util::WifiIfaceUtil> iface_util,
-        const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags);
+    WifiApIface(const std::string& ifname,
+                const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal,
+                const std::weak_ptr<iface_util::WifiIfaceUtil> iface_util);
     // Refer to |WifiChip::invalidate()|.
     void invalidate();
     bool isValid();
@@ -72,7 +69,6 @@
     std::string ifname_;
     std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
     std::weak_ptr<iface_util::WifiIfaceUtil> iface_util_;
-    std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags_;
     bool is_valid_;
 
     DISALLOW_COPY_AND_ASSIGN(WifiApIface);