[WifiNl80211] Rename WifiNl80211Manager namespace

Finish the renaming process from wificond -> nl80211.

Bug: 149105833
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Test: system/connectivity/wificond/runtest.sh
Change-Id: Ia430e0c669758c46fca407723db30e076a018729

Android.bp

@@ -156,15 +156,15 @@ cc_library_static {
 filegroup {
     name: "libwificond_ipc_aidl",
     srcs: [
-        "aidl/android/net/wifi/wificond/IApInterface.aidl",
-        "aidl/android/net/wifi/wificond/IApInterfaceEventCallback.aidl",
-        "aidl/android/net/wifi/wificond/IClientInterface.aidl",
-        "aidl/android/net/wifi/wificond/IInterfaceEventCallback.aidl",
-        "aidl/android/net/wifi/wificond/IPnoScanEvent.aidl",
-        "aidl/android/net/wifi/wificond/IScanEvent.aidl",
-        "aidl/android/net/wifi/wificond/ISendMgmtFrameEvent.aidl",
-        "aidl/android/net/wifi/wificond/IWificond.aidl",
-        "aidl/android/net/wifi/wificond/IWifiScannerImpl.aidl",
+        "aidl/android/net/wifi/nl80211/IApInterface.aidl",
+        "aidl/android/net/wifi/nl80211/IApInterfaceEventCallback.aidl",
+        "aidl/android/net/wifi/nl80211/IClientInterface.aidl",
+        "aidl/android/net/wifi/nl80211/IInterfaceEventCallback.aidl",
+        "aidl/android/net/wifi/nl80211/IPnoScanEvent.aidl",
+        "aidl/android/net/wifi/nl80211/IScanEvent.aidl",
+        "aidl/android/net/wifi/nl80211/ISendMgmtFrameEvent.aidl",
+        "aidl/android/net/wifi/nl80211/IWificond.aidl",
+        "aidl/android/net/wifi/nl80211/IWifiScannerImpl.aidl",
     ],
     path: "aidl",
 }

aidl/android/net/wifi/nl80211/DeviceWiphyCapabilities.aidl

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 parcelable DeviceWiphyCapabilities cpp_header "wificond/device_wiphy_capabilities.h";

aidl/android/net/wifi/nl80211/IApInterface.aidl

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
-import android.net.wifi.wificond.IApInterfaceEventCallback;
-import android.net.wifi.wificond.NativeWifiClient;
+import android.net.wifi.nl80211.IApInterfaceEventCallback;
+import android.net.wifi.nl80211.NativeWifiClient;
 
 /**
  * IApInterface represents a network interface configured to act as a

aidl/android/net/wifi/nl80211/IApInterfaceEventCallback.aidl

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
-import android.net.wifi.wificond.NativeWifiClient;
+import android.net.wifi.nl80211.NativeWifiClient;
 
 /**
  * A callback for receiving events related to soft AP.

aidl/android/net/wifi/nl80211/IClientInterface.aidl

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
-import android.net.wifi.wificond.ISendMgmtFrameEvent;
-import android.net.wifi.wificond.IWifiScannerImpl;
+import android.net.wifi.nl80211.ISendMgmtFrameEvent;
+import android.net.wifi.nl80211.IWifiScannerImpl;
 
 /**
  * IClientInterface represents a network interface that can be used to connect

aidl/android/net/wifi/nl80211/IInterfaceEventCallback.aidl

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
-import android.net.wifi.wificond.IApInterface;
-import android.net.wifi.wificond.IClientInterface;
+import android.net.wifi.nl80211.IApInterface;
+import android.net.wifi.nl80211.IClientInterface;
 
 /**
  * A callback for receiving events related to this chip.

aidl/android/net/wifi/nl80211/IPnoScanEvent.aidl

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 /**
  * A callback for receiving pno scanning events.

aidl/android/net/wifi/nl80211/IScanEvent.aidl

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 /**
  * A callback for receiving scanning events.

aidl/android/net/wifi/nl80211/ISendMgmtFrameEvent.aidl

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 /**
  * A callback to notify the results of sending a management frame.

aidl/android/net/wifi/nl80211/IWifiScannerImpl.aidl

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
-import android.net.wifi.wificond.IPnoScanEvent;
-import android.net.wifi.wificond.IScanEvent;
-import android.net.wifi.wificond.NativeScanResult;
-import android.net.wifi.wificond.PnoSettings;
-import android.net.wifi.wificond.SingleScanSettings;
+import android.net.wifi.nl80211.IPnoScanEvent;
+import android.net.wifi.nl80211.IScanEvent;
+import android.net.wifi.nl80211.NativeScanResult;
+import android.net.wifi.nl80211.PnoSettings;
+import android.net.wifi.nl80211.SingleScanSettings;
 
 /**
  * @hide

aidl/android/net/wifi/nl80211/IWificond.aidl

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
-import android.net.wifi.wificond.IApInterface;
-import android.net.wifi.wificond.IClientInterface;
-import android.net.wifi.wificond.IInterfaceEventCallback;
-import android.net.wifi.wificond.DeviceWiphyCapabilities;
+import android.net.wifi.nl80211.IApInterface;
+import android.net.wifi.nl80211.IClientInterface;
+import android.net.wifi.nl80211.IInterfaceEventCallback;
+import android.net.wifi.nl80211.DeviceWiphyCapabilities;
 
 /**
  * Service interface that exposes primitives for controlling the WiFi

aidl/android/net/wifi/nl80211/NativeScanResult.aidl

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 parcelable NativeScanResult cpp_header "wificond/scanning/scan_result.h";

aidl/android/net/wifi/nl80211/NativeWifiClient.aidl

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 parcelable NativeWifiClient cpp_header "wificond/client/native_wifi_client.h";

aidl/android/net/wifi/nl80211/PnoNetwork.aidl

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 parcelable PnoNetwork cpp_header "wificond/scanning/pno_network.h";

aidl/android/net/wifi/nl80211/PnoSettings.aidl

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 parcelable PnoSettings cpp_header "wificond/scanning/pno_settings.h";

aidl/android/net/wifi/nl80211/SingleScanSettings.aidl

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package android.net.wifi.wificond;
+package android.net.wifi.nl80211;
 
 parcelable SingleScanSettings cpp_header "wificond/scanning/single_scan_settings.h";

ap_interface_binder.cpp

@@ -20,8 +20,8 @@
 
 #include "wificond/ap_interface_impl.h"
 
-using android::net::wifi::wificond::IApInterfaceEventCallback;
-using android::net::wifi::wificond::NativeWifiClient;
+using android::net::wifi::nl80211::IApInterfaceEventCallback;
+using android::net::wifi::nl80211::NativeWifiClient;
 
 namespace android {
 namespace wificond {

ap_interface_binder.h

@@ -21,18 +21,18 @@
 
 #include "wificond/net/netlink_manager.h"
 
-#include "android/net/wifi/wificond/BnApInterface.h"
-#include "android/net/wifi/wificond/IApInterfaceEventCallback.h"
+#include "android/net/wifi/nl80211/BnApInterface.h"
+#include "android/net/wifi/nl80211/IApInterfaceEventCallback.h"
 
-using android::net::wifi::wificond::IApInterfaceEventCallback;
-using android::net::wifi::wificond::NativeWifiClient;
+using android::net::wifi::nl80211::IApInterfaceEventCallback;
+using android::net::wifi::nl80211::NativeWifiClient;
 
 namespace android {
 namespace wificond {
 
 class ApInterfaceImpl;
 
-class ApInterfaceBinder : public android::net::wifi::wificond::BnApInterface {
+class ApInterfaceBinder : public android::net::wifi::nl80211::BnApInterface {
  public:
   explicit ApInterfaceBinder(ApInterfaceImpl* impl);
   ~ApInterfaceBinder() override;

ap_interface_impl.cpp

@@ -23,9 +23,9 @@
 #include "wificond/ap_interface_binder.h"
 #include "wificond/logging_utils.h"
 
-using android::net::wifi::wificond::IApInterface;
+using android::net::wifi::nl80211::IApInterface;
 using android::wifi_system::InterfaceTool;
-using android::net::wifi::wificond::NativeWifiClient;
+using android::net::wifi::nl80211::NativeWifiClient;
 using std::array;
 using std::endl;
 using std::string;

ap_interface_impl.h

@@ -28,10 +28,10 @@
 
 #include "wificond/net/netlink_manager.h"
 
-#include "android/net/wifi/wificond/IApInterface.h"
+#include "android/net/wifi/nl80211/IApInterface.h"
 
-using android::net::wifi::wificond::IApInterface;
-using android::net::wifi::wificond::NativeWifiClient;
+using android::net::wifi::nl80211::IApInterface;
+using android::net::wifi::nl80211::NativeWifiClient;
 
 namespace android {
 namespace wificond {

client/native_wifi_client.cpp

@@ -25,7 +25,7 @@ using android::status_t;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 status_t NativeWifiClient::writeToParcel(::android::Parcel* parcel) const {
   RETURN_IF_FAILED(parcel->writeByteVector(mac_address_));
@@ -37,7 +37,7 @@ status_t NativeWifiClient::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

client/native_wifi_client.h

@@ -25,7 +25,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class NativeWifiClient : public ::android::Parcelable {
  public:
@@ -39,7 +39,7 @@ class NativeWifiClient : public ::android::Parcelable {
   std::vector<uint8_t> mac_address_;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

client_interface_binder.cpp

@@ -28,8 +28,8 @@
 #include "wificond/client_interface_impl.h"
 
 using android::binder::Status;
-using android::net::wifi::wificond::ISendMgmtFrameEvent;
-using android::net::wifi::wificond::IWifiScannerImpl;
+using android::net::wifi::nl80211::ISendMgmtFrameEvent;
+using android::net::wifi::nl80211::IWifiScannerImpl;
 using std::vector;
 
 namespace android {

client_interface_binder.h

@@ -20,15 +20,15 @@
 #include <android-base/macros.h>
 #include <binder/Status.h>
 
-#include "android/net/wifi/wificond/BnClientInterface.h"
-#include "android/net/wifi/wificond/ISendMgmtFrameEvent.h"
+#include "android/net/wifi/nl80211/BnClientInterface.h"
+#include "android/net/wifi/nl80211/ISendMgmtFrameEvent.h"
 
 namespace android {
 namespace wificond {
 
 class ClientInterfaceImpl;
 
-class ClientInterfaceBinder : public android::net::wifi::wificond::BnClientInterface {
+class ClientInterfaceBinder : public android::net::wifi::nl80211::BnClientInterface {
  public:
   explicit ClientInterfaceBinder(ClientInterfaceImpl* impl);
   ~ClientInterfaceBinder() override;
@@ -46,10 +46,10 @@ class ClientInterfaceBinder : public android::net::wifi::wificond::BnClientInter
       std::vector<uint8_t>* out_mac_address) override;
   ::android::binder::Status getInterfaceName(std::string* out_name) override;
   ::android::binder::Status getWifiScannerImpl(
-      ::android::sp<::android::net::wifi::wificond::IWifiScannerImpl>* out_wifi_scanner_impl) override;
+      ::android::sp<::android::net::wifi::nl80211::IWifiScannerImpl>* out_wifi_scanner_impl) override;
   ::android::binder::Status SendMgmtFrame(
       const ::std::vector<uint8_t>& frame,
-      const sp<::android::net::wifi::wificond::ISendMgmtFrameEvent>& callback,
+      const sp<::android::net::wifi::nl80211::ISendMgmtFrameEvent>& callback,
       int32_t mcs) override;
  private:
   ClientInterfaceImpl* impl_;

client_interface_impl.cpp

@@ -29,9 +29,9 @@
 #include "wificond/scanning/scan_utils.h"
 #include "wificond/scanning/scanner_impl.h"
 
-using android::net::wifi::wificond::IClientInterface;
-using android::net::wifi::wificond::ISendMgmtFrameEvent;
-using android::net::wifi::wificond::NativeScanResult;
+using android::net::wifi::nl80211::IClientInterface;
+using android::net::wifi::nl80211::ISendMgmtFrameEvent;
+using android::net::wifi::nl80211::NativeScanResult;
 using android::sp;
 using android::wifi_system::InterfaceTool;
 
@@ -157,7 +157,7 @@ ClientInterfaceImpl::~ClientInterfaceImpl() {
   if_tool_->SetUpState(interface_name_.c_str(), false);
 }
 
-sp<android::net::wifi::wificond::IClientInterface> ClientInterfaceImpl::GetBinder() const {
+sp<android::net::wifi::nl80211::IClientInterface> ClientInterfaceImpl::GetBinder() const {
   return binder_;
 }
 

client_interface_impl.h

@@ -26,8 +26,8 @@
 #include <utils/StrongPointer.h>
 #include <wifi_system/interface_tool.h>
 
-#include "android/net/wifi/wificond/IClientInterface.h"
-#include "android/net/wifi/wificond/ISendMgmtFrameEvent.h"
+#include "android/net/wifi/nl80211/IClientInterface.h"
+#include "android/net/wifi/nl80211/ISendMgmtFrameEvent.h"
 #include "wificond/net/mlme_event_handler.h"
 #include "wificond/net/netlink_utils.h"
 #include "wificond/scanning/scanner_impl.h"
@@ -72,7 +72,7 @@ class ClientInterfaceImpl {
   virtual ~ClientInterfaceImpl();
 
   // Get a pointer to the binder representing this ClientInterfaceImpl.
-  android::sp<android::net::wifi::wificond::IClientInterface> GetBinder() const;
+  android::sp<android::net::wifi::nl80211::IClientInterface> GetBinder() const;
 
   bool GetPacketCounters(std::vector<int32_t>* out_packet_counters);
   bool SignalPoll(std::vector<int32_t>* out_signal_poll_results);
@@ -83,7 +83,7 @@ class ClientInterfaceImpl {
   void Dump(std::stringstream* ss) const;
   void SendMgmtFrame(
       const std::vector<uint8_t>& frame,
-      const sp<::android::net::wifi::wificond::ISendMgmtFrameEvent>& callback,
+      const sp<::android::net::wifi::nl80211::ISendMgmtFrameEvent>& callback,
       int32_t mcs);
 
  private:

device_wiphy_capabilities.cpp

@@ -25,7 +25,7 @@ using android::status_t;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 DeviceWiphyCapabilities::DeviceWiphyCapabilities() {
   is80211nSupported_ = false;
@@ -60,7 +60,7 @@ status_t DeviceWiphyCapabilities::readFromParcel(const ::android::Parcel* parcel
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

device_wiphy_capabilities.h

@@ -23,7 +23,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class DeviceWiphyCapabilities : public ::android::Parcelable {
  public:
@@ -49,7 +49,7 @@ class DeviceWiphyCapabilities : public ::android::Parcelable {
   uint32_t maxRxStreams_;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

main.cpp

@@ -38,7 +38,7 @@
 #include "wificond/server.h"
 #include "wifi_keystore_hal_connector.h"
 
-using android::net::wifi::wificond::IWificond;
+using android::net::wifi::nl80211::IWificond;
 using android::wifi_system::InterfaceTool;
 using android::wificond::ipc_constants::kServiceName;
 using android::wificond::WifiKeystoreHalConnector;

scanning/channel_settings.cpp

@@ -25,7 +25,7 @@ using android::status_t;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 status_t ChannelSettings::writeToParcel(::android::Parcel* parcel) const {
   RETURN_IF_FAILED(parcel->writeInt32(frequency_));
@@ -37,7 +37,7 @@ status_t ChannelSettings::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/channel_settings.h

@@ -23,7 +23,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class ChannelSettings : public ::android::Parcelable {
  public:
@@ -38,7 +38,7 @@ class ChannelSettings : public ::android::Parcelable {
   int32_t frequency_;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/hidden_network.cpp

@@ -25,7 +25,7 @@ using android::status_t;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 status_t HiddenNetwork::writeToParcel(::android::Parcel* parcel) const {
   RETURN_IF_FAILED(parcel->writeByteVector(ssid_));
@@ -37,7 +37,7 @@ status_t HiddenNetwork::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/hidden_network.h

@@ -25,7 +25,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class HiddenNetwork : public ::android::Parcelable {
  public:
@@ -39,7 +39,7 @@ class HiddenNetwork : public ::android::Parcelable {
   std::vector<uint8_t> ssid_;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/pno_network.cpp

@@ -25,7 +25,7 @@ using android::status_t;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 status_t PnoNetwork::writeToParcel(::android::Parcel* parcel) const {
   RETURN_IF_FAILED(parcel->writeInt32(is_hidden_ ? 1 : 0));
@@ -43,7 +43,7 @@ status_t PnoNetwork::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/pno_network.h

@@ -25,7 +25,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class PnoNetwork : public ::android::Parcelable {
  public:
@@ -42,7 +42,7 @@ class PnoNetwork : public ::android::Parcelable {
   std::vector<int32_t> frequencies_;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/pno_settings.cpp

@@ -25,7 +25,7 @@ using android::status_t;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 const uint32_t PnoSettings::kFastScanIterations = 3;
 const uint32_t PnoSettings::kSlowScanIntervalMultiplier = 3;
@@ -70,7 +70,7 @@ status_t PnoSettings::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/pno_settings.h

@@ -27,7 +27,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class PnoSettings : public ::android::Parcelable {
  public:
@@ -55,7 +55,7 @@ class PnoSettings : public ::android::Parcelable {
   std::vector<PnoNetwork> pno_networks_;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/radio_chain_info.cpp

@@ -24,7 +24,7 @@ using android::status_t;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 status_t RadioChainInfo::writeToParcel(::android::Parcel* parcel) const {
   RETURN_IF_FAILED(parcel->writeInt32(chain_id));
@@ -38,7 +38,7 @@ status_t RadioChainInfo::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/radio_chain_info.h

@@ -23,7 +23,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class RadioChainInfo : public ::android::Parcelable {
  public:
@@ -41,7 +41,7 @@ class RadioChainInfo : public ::android::Parcelable {
   int32_t level;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/scan_result.cpp

@@ -30,7 +30,7 @@ using std::string;
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 NativeScanResult::NativeScanResult(std::vector<uint8_t>& ssid_,
                                    std::array<uint8_t, ETH_ALEN>& bssid_,
@@ -134,7 +134,7 @@ void NativeScanResult::DebugLog() {
 
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/scan_result.h

@@ -30,7 +30,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 // This is the class to represent a scan result for wificond internal use.
 class NativeScanResult : public ::android::Parcelable {
@@ -86,7 +86,7 @@ class NativeScanResult : public ::android::Parcelable {
   std::vector<RadioChainInfo> radio_chain_infos;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/scan_utils.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "android/net/wifi/wificond/IWifiScannerImpl.h"
+#include "android/net/wifi/nl80211/IWifiScannerImpl.h"
 #include "wificond/scanning/scan_utils.h"
 
 #include <array>
@@ -30,9 +30,9 @@
 #include "wificond/net/nl80211_packet.h"
 #include "wificond/scanning/scan_result.h"
 
-using android::net::wifi::wificond::IWifiScannerImpl;
-using android::net::wifi::wificond::NativeScanResult;
-using android::net::wifi::wificond::RadioChainInfo;
+using android::net::wifi::nl80211::IWifiScannerImpl;
+using android::net::wifi::nl80211::NativeScanResult;
+using android::net::wifi::nl80211::RadioChainInfo;
 using std::array;
 using std::unique_ptr;
 using std::vector;

scanning/scan_utils.h

@@ -27,12 +27,12 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class NativeScanResult;
 class RadioChainInfo;
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android
@@ -73,7 +73,7 @@ class ScanUtils {
   // Returns true on success.
   virtual bool GetScanResult(
       uint32_t interface_index,
-      std::vector<android::net::wifi::wificond::NativeScanResult>* out_scan_results);
+      std::vector<android::net::wifi::nl80211::NativeScanResult>* out_scan_results);
 
   // Send scan request to kernel for interface with index |interface_index|.
   // - |request_random_mac| If true, request device/driver to use a random MAC
@@ -188,14 +188,14 @@ class ScanUtils {
                        uint64_t* last_seen_since_boot_microseconds);
   bool ParseRadioChainInfos(
       const NL80211NestedAttr& bss,
-      std::vector<android::net::wifi::wificond::RadioChainInfo>
+      std::vector<android::net::wifi::nl80211::RadioChainInfo>
         *radio_chain_infos);
   bool GetSSIDFromInfoElement(const std::vector<uint8_t>& ie,
                               std::vector<uint8_t>* ssid);
   // Converts a NL80211_CMD_NEW_SCAN_RESULTS packet to a ScanResult object.
   bool ParseScanResult(
       std::unique_ptr<const NL80211Packet> packet,
-      android::net::wifi::wificond::NativeScanResult* scan_result);
+      android::net::wifi::nl80211::NativeScanResult* scan_result);
 
   NetlinkManager* netlink_manager_;
 

scanning/scanner_impl.cpp

@@ -27,12 +27,12 @@
 
 using android::binder::Status;
 using android::sp;
-using android::net::wifi::wificond::IPnoScanEvent;
-using android::net::wifi::wificond::IScanEvent;
-using android::net::wifi::wificond::IWifiScannerImpl;
-using android::net::wifi::wificond::NativeScanResult;
-using android::net::wifi::wificond::PnoSettings;
-using android::net::wifi::wificond::SingleScanSettings;
+using android::net::wifi::nl80211::IPnoScanEvent;
+using android::net::wifi::nl80211::IScanEvent;
+using android::net::wifi::nl80211::IWifiScannerImpl;
+using android::net::wifi::nl80211::NativeScanResult;
+using android::net::wifi::nl80211::PnoSettings;
+using android::net::wifi::nl80211::SingleScanSettings;
 
 using std::string;
 using std::vector;
@@ -424,7 +424,7 @@ void ScannerImpl::OnSchedScanResultsReady(uint32_t interface_index,
 }
 
 SchedScanIntervalSetting ScannerImpl::GenerateIntervalSetting(
-    const android::net::wifi::wificond::PnoSettings&
+    const android::net::wifi::nl80211::PnoSettings&
         pno_settings) const {
   bool support_num_scan_plans = scan_capabilities_.max_num_scan_plans >= 2;
   bool support_scan_plan_interval =

scanning/scanner_impl.h

@@ -22,7 +22,7 @@
 #include <android-base/macros.h>
 #include <binder/Status.h>
 
-#include "android/net/wifi/wificond/BnWifiScannerImpl.h"
+#include "android/net/wifi/nl80211/BnWifiScannerImpl.h"
 #include "wificond/net/netlink_utils.h"
 #include "wificond/scanning/scan_utils.h"
 
@@ -32,7 +32,7 @@ namespace wificond {
 class ClientInterfaceImpl;
 class ScanUtils;
 
-class ScannerImpl : public android::net::wifi::wificond::BnWifiScannerImpl {
+class ScannerImpl : public android::net::wifi::nl80211::BnWifiScannerImpl {
  public:
   ScannerImpl(uint32_t interface_index,
               const ScanCapabilities& scan_capabilities,
@@ -42,28 +42,28 @@ class ScannerImpl : public android::net::wifi::wificond::BnWifiScannerImpl {
   ~ScannerImpl();
   // Get the latest single scan results from kernel.
   ::android::binder::Status getScanResults(
-      std::vector<android::net::wifi::wificond::NativeScanResult>*
+      std::vector<android::net::wifi::nl80211::NativeScanResult>*
           out_scan_results) override;
   // Get the latest pno scan results from the interface that most recently
   // completed PNO scans
   ::android::binder::Status getPnoScanResults(
-      std::vector<android::net::wifi::wificond::NativeScanResult>*
+      std::vector<android::net::wifi::nl80211::NativeScanResult>*
           out_scan_results) override;
   ::android::binder::Status scan(
-      const android::net::wifi::wificond::SingleScanSettings&
+      const android::net::wifi::nl80211::SingleScanSettings&
           scan_settings,
       bool* out_success) override;
   ::android::binder::Status startPnoScan(
-      const android::net::wifi::wificond::PnoSettings& pno_settings,
+      const android::net::wifi::nl80211::PnoSettings& pno_settings,
       bool* out_success) override;
   ::android::binder::Status stopPnoScan(bool* out_success) override;
   ::android::binder::Status abortScan() override;
 
   ::android::binder::Status subscribeScanEvents(
-      const ::android::sp<::android::net::wifi::wificond::IScanEvent>& handler) override;
+      const ::android::sp<::android::net::wifi::nl80211::IScanEvent>& handler) override;
   ::android::binder::Status unsubscribeScanEvents() override;
   ::android::binder::Status subscribePnoScanEvents(
-      const ::android::sp<::android::net::wifi::wificond::IPnoScanEvent>& handler)
+      const ::android::sp<::android::net::wifi::nl80211::IPnoScanEvent>& handler)
       override;
   ::android::binder::Status unsubscribePnoScanEvents() override;
   void Invalidate();
@@ -77,21 +77,21 @@ class ScannerImpl : public android::net::wifi::wificond::BnWifiScannerImpl {
   void LogSsidList(std::vector<std::vector<uint8_t>>& ssid_list,
                    std::string prefix);
   bool StartPnoScanDefault(
-      const android::net::wifi::wificond::PnoSettings& pno_settings);
+      const android::net::wifi::nl80211::PnoSettings& pno_settings);
   bool StopPnoScanDefault();
   void ParsePnoSettings(
-      const android::net::wifi::wificond::PnoSettings& pno_settings,
+      const android::net::wifi::nl80211::PnoSettings& pno_settings,
       std::vector<std::vector<uint8_t>>* scan_ssids,
       std::vector<std::vector<uint8_t>>* match_ssids,
       std::vector<uint32_t>* freqs, std::vector<uint8_t>* match_security);
   SchedScanIntervalSetting GenerateIntervalSetting(
-    const android::net::wifi::wificond::PnoSettings& pno_settings) const;
+    const android::net::wifi::nl80211::PnoSettings& pno_settings) const;
 
   // Boolean variables describing current scanner status.
   bool valid_;
   bool scan_started_;
   bool pno_scan_started_;
-  android::net::wifi::wificond::PnoSettings pno_settings_;
+  android::net::wifi::nl80211::PnoSettings pno_settings_;
 
   uint32_t nodev_counter_;
   const uint32_t interface_index_;
@@ -102,8 +102,8 @@ class ScannerImpl : public android::net::wifi::wificond::BnWifiScannerImpl {
 
   ClientInterfaceImpl* client_interface_;
   ScanUtils* const scan_utils_;
-  ::android::sp<::android::net::wifi::wificond::IPnoScanEvent> pno_scan_event_handler_;
-  ::android::sp<::android::net::wifi::wificond::IScanEvent> scan_event_handler_;
+  ::android::sp<::android::net::wifi::nl80211::IPnoScanEvent> pno_scan_event_handler_;
+  ::android::sp<::android::net::wifi::nl80211::IScanEvent> scan_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(ScannerImpl);
 };

scanning/single_scan_settings.cpp

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include "android/net/wifi/wificond/IWifiScannerImpl.h"
+#include "android/net/wifi/nl80211/IWifiScannerImpl.h"
 #include "wificond/scanning/single_scan_settings.h"
 
 #include <android-base/logging.h>
 
 #include "wificond/parcelable_utils.h"
 
-using android::net::wifi::wificond::IWifiScannerImpl;
+using android::net::wifi::nl80211::IWifiScannerImpl;
 using android::status_t;
 
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 bool SingleScanSettings::isValidScanType() const {
   return (scan_type_ == IWifiScannerImpl::SCAN_TYPE_LOW_SPAN ||
           scan_type_ == IWifiScannerImpl::SCAN_TYPE_LOW_POWER ||
@@ -108,7 +108,7 @@ status_t SingleScanSettings::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

scanning/single_scan_settings.h

@@ -28,7 +28,7 @@
 namespace android {
 namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class SingleScanSettings : public ::android::Parcelable {
  public:
@@ -49,7 +49,7 @@ class SingleScanSettings : public ::android::Parcelable {
   bool isValidScanType() const;
 };
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
 }  // namespace net
 }  // namespace android

server.cpp

@@ -32,10 +32,10 @@ using android::base::WriteStringToFd;
 using android::binder::Status;
 using android::sp;
 using android::IBinder;
-using android::net::wifi::wificond::IApInterface;
-using android::net::wifi::wificond::IClientInterface;
-using android::net::wifi::wificond::IInterfaceEventCallback;
-using android::net::wifi::wificond::DeviceWiphyCapabilities;
+using android::net::wifi::nl80211::IApInterface;
+using android::net::wifi::nl80211::IClientInterface;
+using android::net::wifi::nl80211::IInterfaceEventCallback;
+using android::net::wifi::nl80211::DeviceWiphyCapabilities;
 using android::wifi_system::InterfaceTool;
 
 using std::endl;

server.h

@@ -24,10 +24,10 @@
 #include <android-base/macros.h>
 #include <wifi_system/interface_tool.h>
 
-#include "android/net/wifi/wificond/BnWificond.h"
-#include "android/net/wifi/wificond/IApInterface.h"
-#include "android/net/wifi/wificond/IClientInterface.h"
-#include "android/net/wifi/wificond/IInterfaceEventCallback.h"
+#include "android/net/wifi/nl80211/BnWificond.h"
+#include "android/net/wifi/nl80211/IApInterface.h"
+#include "android/net/wifi/nl80211/IClientInterface.h"
+#include "android/net/wifi/nl80211/IInterfaceEventCallback.h"
 
 #include "wificond/ap_interface_impl.h"
 #include "wificond/client_interface_impl.h"
@@ -41,7 +41,7 @@ class ScanUtils;
 
 struct InterfaceInfo;
 
-class Server : public android::net::wifi::wificond::BnWificond {
+class Server : public android::net::wifi::nl80211::BnWificond {
  public:
   Server(std::unique_ptr<wifi_system::InterfaceTool> if_tool,
          NetlinkUtils* netlink_utils,
@@ -49,10 +49,10 @@ class Server : public android::net::wifi::wificond::BnWificond {
   ~Server() override = default;
 
   android::binder::Status RegisterCallback(
-      const android::sp<android::net::wifi::wificond::IInterfaceEventCallback>&
+      const android::sp<android::net::wifi::nl80211::IInterfaceEventCallback>&
           callback) override;
   android::binder::Status UnregisterCallback(
-      const android::sp<android::net::wifi::wificond::IInterfaceEventCallback>&
+      const android::sp<android::net::wifi::nl80211::IInterfaceEventCallback>&
           callback) override;
   // Returns a vector of available frequencies for 2.4GHz channels.
   android::binder::Status getAvailable2gChannels(
@@ -69,12 +69,12 @@ class Server : public android::net::wifi::wificond::BnWificond {
 
   android::binder::Status createApInterface(
       const std::string& iface_name,
-      android::sp<android::net::wifi::wificond::IApInterface>*
+      android::sp<android::net::wifi::nl80211::IApInterface>*
           created_interface) override;
 
   android::binder::Status createClientInterface(
       const std::string& iface_name,
-      android::sp<android::net::wifi::wificond::IClientInterface>*
+      android::sp<android::net::wifi::nl80211::IClientInterface>*
           created_interface) override;
 
   android::binder::Status tearDownApInterface(
@@ -96,7 +96,7 @@ class Server : public android::net::wifi::wificond::BnWificond {
   // Returns device wiphy capabilities for an interface
   android::binder::Status getDeviceWiphyCapabilities(
       const std::string& iface_name,
-      ::std::unique_ptr<net::wifi::wificond::DeviceWiphyCapabilities>* capabilities) override;
+      ::std::unique_ptr<net::wifi::nl80211::DeviceWiphyCapabilities>* capabilities) override;
 
  private:
   // Request interface information from kernel and setup local interface object.
@@ -109,13 +109,13 @@ class Server : public android::net::wifi::wificond::BnWificond {
   void LogSupportedBands();
   void OnRegDomainChanged(std::string& country_code);
   void BroadcastClientInterfaceReady(
-      android::sp<android::net::wifi::wificond::IClientInterface> network_interface);
+      android::sp<android::net::wifi::nl80211::IClientInterface> network_interface);
   void BroadcastApInterfaceReady(
-      android::sp<android::net::wifi::wificond::IApInterface> network_interface);
+      android::sp<android::net::wifi::nl80211::IApInterface> network_interface);
   void BroadcastClientInterfaceTornDown(
-      android::sp<android::net::wifi::wificond::IClientInterface> network_interface);
+      android::sp<android::net::wifi::nl80211::IClientInterface> network_interface);
   void BroadcastApInterfaceTornDown(
-      android::sp<android::net::wifi::wificond::IApInterface> network_interface);
+      android::sp<android::net::wifi::nl80211::IApInterface> network_interface);
   void MarkDownAllInterfaces();
 
   const std::unique_ptr<wifi_system::InterfaceTool> if_tool_;
@@ -125,7 +125,7 @@ class Server : public android::net::wifi::wificond::BnWificond {
   uint32_t wiphy_index_;
   std::map<std::string, std::unique_ptr<ApInterfaceImpl>> ap_interfaces_;
   std::map<std::string, std::unique_ptr<ClientInterfaceImpl>> client_interfaces_;
-  std::vector<android::sp<android::net::wifi::wificond::IInterfaceEventCallback>>
+  std::vector<android::sp<android::net::wifi::nl80211::IInterfaceEventCallback>>
       interface_event_callbacks_;
 
   // Cached interface list from kernel.

tests/ap_interface_impl_unittest.cpp

@@ -32,7 +32,7 @@
 #include "wificond/ap_interface_impl.h"
 
 using android::wifi_system::MockInterfaceTool;
-using android::net::wifi::wificond::NativeWifiClient;
+using android::net::wifi::nl80211::NativeWifiClient;
 using std::array;
 using std::placeholders::_1;
 using std::placeholders::_2;

tests/integration/ap_interface_test.cpp

@@ -20,13 +20,13 @@
 #include <utils/StrongPointer.h>
 #include <wifi_system/interface_tool.h>
 
-#include "android/net/wifi/wificond/IApInterface.h"
-#include "android/net/wifi/wificond/IWificond.h"
+#include "android/net/wifi/nl80211/IApInterface.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 #include "wificond/tests/integration/process_utils.h"
 #include "wificond/tests/mock_ap_interface_event_callback.h"
 
-using android::net::wifi::wificond::IApInterface;
-using android::net::wifi::wificond::IWificond;
+using android::net::wifi::nl80211::IApInterface;
+using android::net::wifi::nl80211::IWificond;
 using android::wifi_system::InterfaceTool;
 using android::wificond::MockApInterfaceEventCallback;
 using android::wificond::tests::integration::ScopedDevModeWificond;

tests/integration/client_interface_test.cpp

@@ -21,12 +21,12 @@
 #include <utils/StrongPointer.h>
 #include <wifi_system/interface_tool.h>
 
-#include "android/net/wifi/wificond/IClientInterface.h"
-#include "android/net/wifi/wificond/IWificond.h"
+#include "android/net/wifi/nl80211/IClientInterface.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 #include "wificond/tests/integration/process_utils.h"
 
-using android::net::wifi::wificond::IClientInterface;
-using android::net::wifi::wificond::IWificond;
+using android::net::wifi::nl80211::IClientInterface;
+using android::net::wifi::nl80211::IWificond;
 using android::wifi_system::InterfaceTool;
 using android::wificond::tests::integration::ScopedDevModeWificond;
 using std::string;

tests/integration/process_utils.cpp

@@ -32,7 +32,7 @@
 using android::String16;
 using android::base::StringPrintf;
 using android::base::Trim;
-using android::net::wifi::wificond::IWificond;
+using android::net::wifi::nl80211::IWificond;
 using android::sp;
 using android::wificond::ipc_constants::kServiceName;
 

tests/integration/process_utils.h

@@ -24,7 +24,7 @@
 #include <android-base/macros.h>
 #include <utils/StrongPointer.h>
 
-#include "android/net/wifi/wificond/IWificond.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 
 namespace android {
 namespace wificond {
@@ -57,9 +57,9 @@ class ScopedDevModeWificond final {
   // This makes avoids the nastiness of restarting a system process
   // because you instantiated an object.
   // ASSERTs that wificond starts in dev mode.
-  android::sp<android::net::wifi::wificond::IWificond> EnterDevModeOrDie();
+  android::sp<android::net::wifi::nl80211::IWificond> EnterDevModeOrDie();
   // Returns true iff wificond entered dev mode.
-  android::sp<android::net::wifi::wificond::IWificond> MaybeEnterDevMode();
+  android::sp<android::net::wifi::nl80211::IWificond> MaybeEnterDevMode();
 
   // This will be called for you in the destructor, but you can do it yourself
   // if you prefer.

tests/integration/scanner_test.cpp

@@ -20,13 +20,13 @@
 #include <gtest/gtest.h>
 #include <utils/StrongPointer.h>
 
-#include "android/net/wifi/wificond/IClientInterface.h"
-#include "android/net/wifi/wificond/IWificond.h"
+#include "android/net/wifi/nl80211/IClientInterface.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 #include "wificond/tests/integration/process_utils.h"
 
-using android::net::wifi::wificond::IClientInterface;
-using android::net::wifi::wificond::IWificond;
-using android::net::wifi::wificond::IWifiScannerImpl;
+using android::net::wifi::nl80211::IClientInterface;
+using android::net::wifi::nl80211::IWificond;
+using android::net::wifi::nl80211::IWifiScannerImpl;
 using android::wificond::tests::integration::ScopedDevModeWificond;
 using std::unique_ptr;
 using std::vector;

tests/mock_ap_interface_event_callback.h

@@ -20,20 +20,20 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "android/net/wifi/wificond/IApInterfaceEventCallback.h"
+#include "android/net/wifi/nl80211/IApInterfaceEventCallback.h"
 
 namespace android {
 namespace wificond {
 
 class MockApInterfaceEventCallback
-    : public net::wifi::wificond::IApInterfaceEventCallback {
+    : public net::wifi::nl80211::IApInterfaceEventCallback {
  public:
   MockApInterfaceEventCallback() = default;
   ~MockApInterfaceEventCallback() = default;
 
   MOCK_METHOD0(onAsBinder, IBinder*());
   MOCK_METHOD2(onConnectedClientsChanged, ::android::binder::Status(
-    const android::net::wifi::wificond::NativeWifiClient &, bool isConnected));
+    const android::net::wifi::nl80211::NativeWifiClient &, bool isConnected));
   MOCK_METHOD2(onSoftApChannelSwitched, ::android::binder::Status(int, int));
 };
 

tests/mock_i_send_mgmt_frame_event.h

@@ -20,13 +20,13 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "android/net/wifi/wificond/ISendMgmtFrameEvent.h"
+#include "android/net/wifi/nl80211/ISendMgmtFrameEvent.h"
 
 namespace android {
 namespace wificond {
 
 class MockISendMgmtFrameEvent
-    : public ::android::net::wifi::wificond::ISendMgmtFrameEvent {
+    : public ::android::net::wifi::nl80211::ISendMgmtFrameEvent {
  public:
   virtual ~MockISendMgmtFrameEvent() override = default;
 

tests/mock_scan_utils.h

@@ -39,7 +39,7 @@ class MockScanUtils : public ScanUtils {
       OnScanResultsReadyHandler handler));
   MOCK_METHOD2(GetScanResult, bool(
       uint32_t interface_index,
-      std::vector<android::net::wifi::wificond::NativeScanResult>* out_scan_results));
+      std::vector<android::net::wifi::nl80211::NativeScanResult>* out_scan_results));
 
   MOCK_METHOD6(Scan, bool(
       uint32_t interface_index,

tests/native_wifi_client_unittest.cpp

@@ -20,7 +20,7 @@
 
 #include "wificond/client/native_wifi_client.h"
 
-using ::android::net::wifi::wificond::NativeWifiClient;
+using ::android::net::wifi::nl80211::NativeWifiClient;
 using std::vector;
 
 namespace android {

tests/scan_result_unittest.cpp

@@ -23,8 +23,8 @@
 
 #include "wificond/scanning/scan_result.h"
 
-using ::android::net::wifi::wificond::NativeScanResult;
-using ::android::net::wifi::wificond::RadioChainInfo;
+using ::android::net::wifi::nl80211::NativeScanResult;
+using ::android::net::wifi::nl80211::RadioChainInfo;
 using std::array;
 using std::vector;
 

tests/scan_settings_unittest.cpp

@@ -18,19 +18,19 @@
 
 #include <gtest/gtest.h>
 
-#include "android/net/wifi/wificond/IWifiScannerImpl.h"
+#include "android/net/wifi/nl80211/IWifiScannerImpl.h"
 #include "wificond/scanning/channel_settings.h"
 #include "wificond/scanning/hidden_network.h"
 #include "wificond/scanning/pno_network.h"
 #include "wificond/scanning/pno_settings.h"
 #include "wificond/scanning/single_scan_settings.h"
 
-using ::android::net::wifi::wificond::IWifiScannerImpl;
-using ::android::net::wifi::wificond::ChannelSettings;
-using ::android::net::wifi::wificond::HiddenNetwork;
-using ::android::net::wifi::wificond::PnoNetwork;
-using ::android::net::wifi::wificond::PnoSettings;
-using ::android::net::wifi::wificond::SingleScanSettings;
+using ::android::net::wifi::nl80211::IWifiScannerImpl;
+using ::android::net::wifi::nl80211::ChannelSettings;
+using ::android::net::wifi::nl80211::HiddenNetwork;
+using ::android::net::wifi::nl80211::PnoNetwork;
+using ::android::net::wifi::nl80211::PnoSettings;
+using ::android::net::wifi::nl80211::SingleScanSettings;
 using std::vector;
 
 namespace android {

tests/scan_utils_unittest.cpp

@@ -22,7 +22,7 @@
 
 #include <gtest/gtest.h>
 
-#include "android/net/wifi/wificond/IWifiScannerImpl.h"
+#include "android/net/wifi/nl80211/IWifiScannerImpl.h"
 #include "wificond/net/kernel-header-latest/nl80211.h"
 #include "wificond/scanning/scan_result.h"
 #include "wificond/scanning/scan_utils.h"
@@ -40,8 +40,8 @@ using testing::Not;
 using testing::Return;
 using testing::_;
 
-using android::net::wifi::wificond::IWifiScannerImpl;
-using android::net::wifi::wificond::NativeScanResult;
+using android::net::wifi::nl80211::IWifiScannerImpl;
+using android::net::wifi::nl80211::NativeScanResult;
 
 namespace android {
 namespace wificond {

tests/scanner_unittest.cpp

@@ -19,7 +19,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <wifi_system_test/mock_interface_tool.h>
-#include "android/net/wifi/wificond/IWifiScannerImpl.h"
+#include "android/net/wifi/nl80211/IWifiScannerImpl.h"
 #include "wificond/scanning/scanner_impl.h"
 #include "wificond/tests/mock_client_interface_impl.h"
 #include "wificond/tests/mock_netlink_manager.h"
@@ -27,11 +27,11 @@
 #include "wificond/tests/mock_scan_utils.h"
 
 using ::android::binder::Status;
-using ::android::net::wifi::wificond::IWifiScannerImpl;
-using ::android::net::wifi::wificond::SingleScanSettings;
-using ::android::net::wifi::wificond::PnoNetwork;
-using ::android::net::wifi::wificond::PnoSettings;
-using ::android::net::wifi::wificond::NativeScanResult;
+using ::android::net::wifi::nl80211::IWifiScannerImpl;
+using ::android::net::wifi::nl80211::SingleScanSettings;
+using ::android::net::wifi::nl80211::PnoNetwork;
+using ::android::net::wifi::nl80211::PnoSettings;
+using ::android::net::wifi::nl80211::NativeScanResult;
 using ::android::wifi_system::MockInterfaceTool;
 using ::testing::Eq;
 using ::testing::Invoke;

tests/server_unittest.cpp

@@ -21,14 +21,14 @@
 #include <gtest/gtest.h>
 #include <wifi_system_test/mock_interface_tool.h>
 
-#include "android/net/wifi/wificond/IApInterface.h"
+#include "android/net/wifi/nl80211/IApInterface.h"
 #include "wificond/tests/mock_netlink_manager.h"
 #include "wificond/tests/mock_netlink_utils.h"
 #include "wificond/tests/mock_scan_utils.h"
 #include "wificond/server.h"
 
-using android::net::wifi::wificond::IApInterface;
-using android::net::wifi::wificond::IClientInterface;
+using android::net::wifi::nl80211::IApInterface;
+using android::net::wifi::nl80211::IClientInterface;
 using android::wifi_system::InterfaceTool;
 using android::wifi_system::MockInterfaceTool;
 using std::unique_ptr;