Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8440f712 authored by Gabriel Biren's avatar Gabriel Biren Committed by Automerger Merge Worker
Browse files

Merge "Acquire the global lock when the dump method is called." into udc-dev am: f5c86e53 

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



Change-Id: Id6b5da234d9f500b1a73e508fe421b1398125ed0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dfe6e088 f5c86e53

wifi/aidl/default/wifi.cpp

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <android-base/logging.h>



#include "aidl_return_util.h"

#include "aidl_sync_util.h"

#include "wifi_status_util.h"



namespace {
@@ -32,6 +33,7 @@ namespace hardware { 
namespace wifi {

using aidl_return_util::validateAndCall;

using aidl_return_util::validateAndCallWithLock;

using aidl_sync_util::acquireGlobalLock;



Wifi::Wifi(const std::shared_ptr<::android::wifi_system::InterfaceTool> iface_tool,

           const std::shared_ptr<legacy_hal::WifiLegacyHalFactory> legacy_hal_factory,
@@ -78,6 +80,7 @@ ndk::ScopedAStatus Wifi::getChip(int32_t in_chipId, std::shared_ptr<IWifiChip>* 
}



binder_status_t Wifi::dump(int fd, const char** args, uint32_t numArgs) {

    const auto lock = acquireGlobalLock();

    LOG(INFO) << "-----------Debug was called----------------";

    if (chips_.size() == 0) {

        LOG(INFO) << "No chips to display.";