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

Commit b883f2f2 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

wifi: Move legacy hal types to a new namespace (2/2) 

am: 6cedc97e

Change-Id: I7c999625fb5a39d2568f39189905a67f9366d078
parents 795999b4 6cedc97e

wifi/1.0/default/wifi.cpp

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ namespace implementation { 
using hidl_return_util::validateAndCall;



Wifi::Wifi()

    : legacy_hal_(new WifiLegacyHal()), run_state_(RunState::STOPPED) {}

    : legacy_hal_(new legacy_hal::WifiLegacyHal()),

      run_state_(RunState::STOPPED) {}



bool Wifi::isValid() {

  // This object is always valid.

wifi/1.0/default/wifi.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class Wifi : public IWifi { 


  // Instance is created in this root level |IWifi| HIDL interface object

  // and shared with all the child HIDL interface objects.

  std::shared_ptr<WifiLegacyHal> legacy_hal_;

  std::shared_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;

  RunState run_state_;

  std::vector<sp<IWifiEventCallback>> event_callbacks_;

  sp<WifiChip> chip_;

wifi/1.0/default/wifi_ap_iface.cpp

+3 −2
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ namespace V1_0 { 
namespace implementation {

using hidl_return_util::validateAndCall;



WifiApIface::WifiApIface(const std::string& ifname,

                         const std::weak_ptr<WifiLegacyHal> legacy_hal)

WifiApIface::WifiApIface(

    const std::string& ifname,

    const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)

    : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}



void WifiApIface::invalidate() {

wifi/1.0/default/wifi_ap_iface.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace implementation { 
class WifiApIface : public IWifiApIface {

 public:

  WifiApIface(const std::string& ifname,

              const std::weak_ptr<WifiLegacyHal> legacy_hal);

              const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);

  // Refer to |WifiChip::invalidate()|.

  void invalidate();

  bool isValid();
@@ -49,7 +49,7 @@ class WifiApIface : public IWifiApIface { 
  std::pair<WifiStatus, IfaceType> getTypeInternal();



  std::string ifname_;

  std::weak_ptr<WifiLegacyHal> legacy_hal_;

  std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;

  bool is_valid_;



  DISALLOW_COPY_AND_ASSIGN(WifiApIface);

wifi/1.0/default/wifi_chip.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ namespace implementation { 
using hidl_return_util::validateAndCall;



WifiChip::WifiChip(ChipId chip_id,

                   const std::weak_ptr<WifiLegacyHal> legacy_hal)

                   const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)

    : chip_id_(chip_id), legacy_hal_(legacy_hal), is_valid_(true) {}



void WifiChip::invalidate() {