Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Set the value of using_dynamic_iface_combination_ in the WifiChip constructor." into udc-dev am: 0f1628e1ac am: 7986ce4d2b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23699648

Change-Id: I4251e40316b1543e19c0e235b597ea6de878db2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gabriel Biren
2023-06-16 22:05:50 +00:00
committed by Automerger Merge Worker
parent 3b8397d8b3 7986ce4d2b
commit 3e16cdd3fc
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/aidl/default/tests/wifi_chip_unit_tests.cpp
View File

@@ -282,7 +282,7 @@ class WifiChipTest : public Test {
public: public:
void SetUp() override { void SetUp() override {
chip_ = WifiChip::create(chip_id_, true, legacy_hal_, mode_controller_, iface_util_, chip_ = WifiChip::create(chip_id_, true, legacy_hal_, mode_controller_, iface_util_,
feature_flags_, subsystemRestartHandler); feature_flags_, subsystemRestartHandler, true);
EXPECT_CALL(*mode_controller_, changeFirmwareMode(testing::_)) EXPECT_CALL(*mode_controller_, changeFirmwareMode(testing::_))
.WillRepeatedly(testing::Return(true)); .WillRepeatedly(testing::Return(true));

2
wifi/aidl/default/wifi.cpp
View File

@@ -133,7 +133,7 @@ ndk::ScopedAStatus Wifi::startInternal() {
chips_.push_back( chips_.push_back(
WifiChip::create(chipId, chipId == kPrimaryChipId, hal, mode_controller_, WifiChip::create(chipId, chipId == kPrimaryChipId, hal, mode_controller_,
std::make_shared<iface_util::WifiIfaceUtil>(iface_tool_, hal), std::make_shared<iface_util::WifiIfaceUtil>(iface_tool_, hal),
feature_flags_, on_subsystem_restart_callback)); feature_flags_, on_subsystem_restart_callback, false));
chipId++; chipId++;
} }
run_state_ = RunState::STARTED; run_state_ = RunState::STARTED;

11
wifi/aidl/default/wifi_chip.cpp
View File

@@ -366,7 +366,8 @@ WifiChip::WifiChip(int32_t chip_id, bool is_primary,
const std::weak_ptr<mode_controller::WifiModeController> mode_controller, const std::weak_ptr<mode_controller::WifiModeController> mode_controller,
const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util, const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util,
const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags, const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags,
const std::function<void(const std::string&)>& handler) const std::function<void(const std::string&)>& handler,
bool using_dynamic_iface_combination)
: chip_id_(chip_id), : chip_id_(chip_id),
legacy_hal_(legacy_hal), legacy_hal_(legacy_hal),
mode_controller_(mode_controller), mode_controller_(mode_controller),
@@ -375,9 +376,9 @@ WifiChip::WifiChip(int32_t chip_id, bool is_primary,
current_mode_id_(feature_flags::chip_mode_ids::kInvalid), current_mode_id_(feature_flags::chip_mode_ids::kInvalid),
modes_(feature_flags.lock()->getChipModes(is_primary)), modes_(feature_flags.lock()->getChipModes(is_primary)),
debug_ring_buffer_cb_registered_(false), debug_ring_buffer_cb_registered_(false),
using_dynamic_iface_combination_(using_dynamic_iface_combination),
subsystemCallbackHandler_(handler) { subsystemCallbackHandler_(handler) {
setActiveWlanIfaceNameProperty(kNoActiveWlanIfaceNamePropertyValue); setActiveWlanIfaceNameProperty(kNoActiveWlanIfaceNamePropertyValue);
using_dynamic_iface_combination_ = false;
} }
void WifiChip::retrieveDynamicIfaceCombination() { void WifiChip::retrieveDynamicIfaceCombination() {
@@ -413,9 +414,11 @@ std::shared_ptr<WifiChip> WifiChip::create(
const std::weak_ptr<mode_controller::WifiModeController> mode_controller, const std::weak_ptr<mode_controller::WifiModeController> mode_controller,
const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util, const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util,
const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags, const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags,
const std::function<void(const std::string&)>& handler) { const std::function<void(const std::string&)>& handler,
bool using_dynamic_iface_combination) {
std::shared_ptr<WifiChip> ptr = ndk::SharedRefBase::make<WifiChip>( std::shared_ptr<WifiChip> ptr = ndk::SharedRefBase::make<WifiChip>(
chip_id, is_primary, legacy_hal, mode_controller, iface_util, feature_flags, handler); chip_id, is_primary, legacy_hal, mode_controller, iface_util, feature_flags, handler,
using_dynamic_iface_combination);
std::weak_ptr<WifiChip> weak_ptr_this(ptr); std::weak_ptr<WifiChip> weak_ptr_this(ptr);
ptr->setWeakPtr(weak_ptr_this); ptr->setWeakPtr(weak_ptr_this);
return ptr; return ptr;

6
wifi/aidl/default/wifi_chip.h
View File

@@ -53,7 +53,8 @@ class WifiChip : public BnWifiChip {
const std::weak_ptr<mode_controller::WifiModeController> mode_controller, const std::weak_ptr<mode_controller::WifiModeController> mode_controller,
const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util, const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util,
const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags, const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags,
const std::function<void(const std::string&)>& subsystemCallbackHandler); const std::function<void(const std::string&)>& subsystemCallbackHandler,
bool using_dynamic_iface_combination);
// Factory method - use instead of default constructor. // Factory method - use instead of default constructor.
static std::shared_ptr<WifiChip> create( static std::shared_ptr<WifiChip> create(
@@ -62,7 +63,8 @@ class WifiChip : public BnWifiChip {
const std::weak_ptr<mode_controller::WifiModeController> mode_controller, const std::weak_ptr<mode_controller::WifiModeController> mode_controller,
const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util, const std::shared_ptr<iface_util::WifiIfaceUtil> iface_util,
const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags, const std::weak_ptr<feature_flags::WifiFeatureFlags> feature_flags,
const std::function<void(const std::string&)>& subsystemCallbackHandler); const std::function<void(const std::string&)>& subsystemCallbackHandler,
bool using_dynamic_iface_combination);
// AIDL does not provide a built-in mechanism to let the server invalidate // AIDL does not provide a built-in mechanism to let the server invalidate
// an AIDL interface object after creation. If any client process holds onto // an AIDL interface object after creation. If any client process holds onto