diff options
| author | Etan Cohen <etancohen@google.com> | 2020-02-15 17:36:36 -0800 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2020-02-15 17:37:33 -0800 |
| commit | 067e1194a3f55869bc9d2a16f88f4bf6e9ac3eef (patch) | |
| tree | 0717a0602b0d9f4d2de2938693fa74b2fe54fcb3 | |
| parent | 0b3265af80d5720b6db6016a2c1840a346c6f3c3 (diff) | |
| download | wificond-067e1194a3f55869bc9d2a16f88f4bf6e9ac3eef.tar.gz | |
[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
64 files changed, 201 insertions, 201 deletions
@@ -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", } diff --git a/aidl/android/net/wifi/wificond/DeviceWiphyCapabilities.aidl b/aidl/android/net/wifi/nl80211/DeviceWiphyCapabilities.aidl index 2f317c4..baa9e84 100644 --- a/aidl/android/net/wifi/wificond/DeviceWiphyCapabilities.aidl +++ b/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"; diff --git a/aidl/android/net/wifi/wificond/IApInterface.aidl b/aidl/android/net/wifi/nl80211/IApInterface.aidl index 8113626..6e7e42f 100644 --- a/aidl/android/net/wifi/wificond/IApInterface.aidl +++ b/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 diff --git a/aidl/android/net/wifi/wificond/IApInterfaceEventCallback.aidl b/aidl/android/net/wifi/nl80211/IApInterfaceEventCallback.aidl index 0745aa8..26a92de 100644 --- a/aidl/android/net/wifi/wificond/IApInterfaceEventCallback.aidl +++ b/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. diff --git a/aidl/android/net/wifi/wificond/IClientInterface.aidl b/aidl/android/net/wifi/nl80211/IClientInterface.aidl index fa40628..59582d2 100644 --- a/aidl/android/net/wifi/wificond/IClientInterface.aidl +++ b/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 diff --git a/aidl/android/net/wifi/wificond/IInterfaceEventCallback.aidl b/aidl/android/net/wifi/nl80211/IInterfaceEventCallback.aidl index 0b56bed..ea7e61b 100644 --- a/aidl/android/net/wifi/wificond/IInterfaceEventCallback.aidl +++ b/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. diff --git a/aidl/android/net/wifi/wificond/IPnoScanEvent.aidl b/aidl/android/net/wifi/nl80211/IPnoScanEvent.aidl index 8c12556..1951d8e 100644 --- a/aidl/android/net/wifi/wificond/IPnoScanEvent.aidl +++ b/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. diff --git a/aidl/android/net/wifi/wificond/IScanEvent.aidl b/aidl/android/net/wifi/nl80211/IScanEvent.aidl index 071b7b4..3ee8195 100644 --- a/aidl/android/net/wifi/wificond/IScanEvent.aidl +++ b/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. diff --git a/aidl/android/net/wifi/wificond/ISendMgmtFrameEvent.aidl b/aidl/android/net/wifi/nl80211/ISendMgmtFrameEvent.aidl index c08ceef..7fd6280 100644 --- a/aidl/android/net/wifi/wificond/ISendMgmtFrameEvent.aidl +++ b/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. diff --git a/aidl/android/net/wifi/wificond/IWifiScannerImpl.aidl b/aidl/android/net/wifi/nl80211/IWifiScannerImpl.aidl index c0dbe71..4cf0c2b 100644 --- a/aidl/android/net/wifi/wificond/IWifiScannerImpl.aidl +++ b/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 diff --git a/aidl/android/net/wifi/wificond/IWificond.aidl b/aidl/android/net/wifi/nl80211/IWificond.aidl index 608a587..65560fd 100644 --- a/aidl/android/net/wifi/wificond/IWificond.aidl +++ b/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 diff --git a/aidl/android/net/wifi/wificond/NativeScanResult.aidl b/aidl/android/net/wifi/nl80211/NativeScanResult.aidl index af6281e..1412596 100644 --- a/aidl/android/net/wifi/wificond/NativeScanResult.aidl +++ b/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"; diff --git a/aidl/android/net/wifi/wificond/NativeWifiClient.aidl b/aidl/android/net/wifi/nl80211/NativeWifiClient.aidl index 5e7220a..4049c6f 100644 --- a/aidl/android/net/wifi/wificond/NativeWifiClient.aidl +++ b/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"; diff --git a/aidl/android/net/wifi/wificond/PnoNetwork.aidl b/aidl/android/net/wifi/nl80211/PnoNetwork.aidl index d27d7d0..859bc47 100644 --- a/aidl/android/net/wifi/wificond/PnoNetwork.aidl +++ b/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"; diff --git a/aidl/android/net/wifi/wificond/PnoSettings.aidl b/aidl/android/net/wifi/nl80211/PnoSettings.aidl index aff592d..6372b1d 100644 --- a/aidl/android/net/wifi/wificond/PnoSettings.aidl +++ b/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"; diff --git a/aidl/android/net/wifi/wificond/SingleScanSettings.aidl b/aidl/android/net/wifi/nl80211/SingleScanSettings.aidl index 4747054..76542e3 100644 --- a/aidl/android/net/wifi/wificond/SingleScanSettings.aidl +++ b/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"; diff --git a/ap_interface_binder.cpp b/ap_interface_binder.cpp index f3738a4..371fa61 100644 --- a/ap_interface_binder.cpp +++ b/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 { diff --git a/ap_interface_binder.h b/ap_interface_binder.h index bf277ff..2977cb0 100644 --- a/ap_interface_binder.h +++ b/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; diff --git a/ap_interface_impl.cpp b/ap_interface_impl.cpp index c7f2e69..efc7c96 100644 --- a/ap_interface_impl.cpp +++ b/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; diff --git a/ap_interface_impl.h b/ap_interface_impl.h index 1b7e685..6c98293 100644 --- a/ap_interface_impl.h +++ b/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 { diff --git a/client/native_wifi_client.cpp b/client/native_wifi_client.cpp index 5eff2c9..50dcaee 100644 --- a/client/native_wifi_client.cpp +++ b/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 diff --git a/client/native_wifi_client.h b/client/native_wifi_client.h index 4e2d1cc..9a2cf26 100644 --- a/client/native_wifi_client.h +++ b/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 diff --git a/client_interface_binder.cpp b/client_interface_binder.cpp index ceeb0ef..f5507e7 100644 --- a/client_interface_binder.cpp +++ b/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 { diff --git a/client_interface_binder.h b/client_interface_binder.h index 82446b6..d84d288 100644 --- a/client_interface_binder.h +++ b/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_; diff --git a/client_interface_impl.cpp b/client_interface_impl.cpp index 2289a7f..15df0fd 100644 --- a/client_interface_impl.cpp +++ b/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_; } diff --git a/client_interface_impl.h b/client_interface_impl.h index 11d4b2a..b4e35ba 100644 --- a/client_interface_impl.h +++ b/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: diff --git a/device_wiphy_capabilities.cpp b/device_wiphy_capabilities.cpp index ee6aab2..d932811 100644 --- a/device_wiphy_capabilities.cpp +++ b/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 diff --git a/device_wiphy_capabilities.h b/device_wiphy_capabilities.h index afe2461..c50f99c 100644 --- a/device_wiphy_capabilities.h +++ b/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 @@ -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; diff --git a/scanning/channel_settings.cpp b/scanning/channel_settings.cpp index d09e762..5b12e4a 100644 --- a/scanning/channel_settings.cpp +++ b/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 diff --git a/scanning/channel_settings.h b/scanning/channel_settings.h index e35b205..748e39b 100644 --- a/scanning/channel_settings.h +++ b/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 diff --git a/scanning/hidden_network.cpp b/scanning/hidden_network.cpp index db06534..ce35b69 100644 --- a/scanning/hidden_network.cpp +++ b/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 diff --git a/scanning/hidden_network.h b/scanning/hidden_network.h index 7ac5252..02ac466 100644 --- a/scanning/hidden_network.h +++ b/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 diff --git a/scanning/pno_network.cpp b/scanning/pno_network.cpp index dc04ae4..17b5cdc 100644 --- a/scanning/pno_network.cpp +++ b/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 diff --git a/scanning/pno_network.h b/scanning/pno_network.h index 2514609..1cb5ded 100644 --- a/scanning/pno_network.h +++ b/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 diff --git a/scanning/pno_settings.cpp b/scanning/pno_settings.cpp index 9c377b1..6307ea7 100644 --- a/scanning/pno_settings.cpp +++ b/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 diff --git a/scanning/pno_settings.h b/scanning/pno_settings.h index 939ddca..f0e0826 100644 --- a/scanning/pno_settings.h +++ b/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 diff --git a/scanning/radio_chain_info.cpp b/scanning/radio_chain_info.cpp index bb66fc8..64506e4 100644 --- a/scanning/radio_chain_info.cpp +++ b/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 diff --git a/scanning/radio_chain_info.h b/scanning/radio_chain_info.h index c55a267..551ab45 100644 --- a/scanning/radio_chain_info.h +++ b/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 diff --git a/scanning/scan_result.cpp b/scanning/scan_result.cpp index 59ea006..ff00ab9 100644 --- a/scanning/scan_result.cpp +++ b/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 diff --git a/scanning/scan_result.h b/scanning/scan_result.h index eef16c2..43c6a15 100644 --- a/scanning/scan_result.h +++ b/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 diff --git a/scanning/scan_utils.cpp b/scanning/scan_utils.cpp index 5c0eedf..4b65a56 100644 --- a/scanning/scan_utils.cpp +++ b/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; diff --git a/scanning/scan_utils.h b/scanning/scan_utils.h index be0940e..bc190c6 100644 --- a/scanning/scan_utils.h +++ b/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_; diff --git a/scanning/scanner_impl.cpp b/scanning/scanner_impl.cpp index 2932e90..83eceb2 100644 --- a/scanning/scanner_impl.cpp +++ b/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 = diff --git a/scanning/scanner_impl.h b/scanning/scanner_impl.h index 6275b2c..6e23ea7 100644 --- a/scanning/scanner_impl.h +++ b/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); }; diff --git a/scanning/single_scan_settings.cpp b/scanning/single_scan_settings.cpp index 552eed2..ec89259 100644 --- a/scanning/single_scan_settings.cpp +++ b/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 diff --git a/scanning/single_scan_settings.h b/scanning/single_scan_settings.h index 76cbd85..6c70e71 100644 --- a/scanning/single_scan_settings.h +++ b/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 @@ -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; @@ -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. diff --git a/tests/ap_interface_impl_unittest.cpp b/tests/ap_interface_impl_unittest.cpp index ef1a9f9..35e8161 100644 --- a/tests/ap_interface_impl_unittest.cpp +++ b/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; diff --git a/tests/integration/ap_interface_test.cpp b/tests/integration/ap_interface_test.cpp index 0bfbd4d..f5812c6 100644 --- a/tests/integration/ap_interface_test.cpp +++ b/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; diff --git a/tests/integration/client_interface_test.cpp b/tests/integration/client_interface_test.cpp index b6a8be1..43ec0f2 100644 --- a/tests/integration/client_interface_test.cpp +++ b/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; diff --git a/tests/integration/process_utils.cpp b/tests/integration/process_utils.cpp index 608c1f6..80d74f3 100644 --- a/tests/integration/process_utils.cpp +++ b/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; diff --git a/tests/integration/process_utils.h b/tests/integration/process_utils.h index 7d6c11a..6101857 100644 --- a/tests/integration/process_utils.h +++ b/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. diff --git a/tests/integration/scanner_test.cpp b/tests/integration/scanner_test.cpp index 565158a..ff817e4 100644 --- a/tests/integration/scanner_test.cpp +++ b/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; diff --git a/tests/mock_ap_interface_event_callback.h b/tests/mock_ap_interface_event_callback.h index 5b516e0..4177987 100644 --- a/tests/mock_ap_interface_event_callback.h +++ b/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)); }; diff --git a/tests/mock_i_send_mgmt_frame_event.h b/tests/mock_i_send_mgmt_frame_event.h index 73bba56..c105590 100644 --- a/tests/mock_i_send_mgmt_frame_event.h +++ b/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; diff --git a/tests/mock_scan_utils.h b/tests/mock_scan_utils.h index 55275ec..acb7f45 100644 --- a/tests/mock_scan_utils.h +++ b/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, diff --git a/tests/native_wifi_client_unittest.cpp b/tests/native_wifi_client_unittest.cpp index 80a1281..e426107 100644 --- a/tests/native_wifi_client_unittest.cpp +++ b/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 { diff --git a/tests/scan_result_unittest.cpp b/tests/scan_result_unittest.cpp index ff0b35a..7cac000 100644 --- a/tests/scan_result_unittest.cpp +++ b/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; diff --git a/tests/scan_settings_unittest.cpp b/tests/scan_settings_unittest.cpp index 5814b46..d3d1574 100644 --- a/tests/scan_settings_unittest.cpp +++ b/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 { diff --git a/tests/scan_utils_unittest.cpp b/tests/scan_utils_unittest.cpp index 2d66fd5..051d7c0 100644 --- a/tests/scan_utils_unittest.cpp +++ b/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 { diff --git a/tests/scanner_unittest.cpp b/tests/scanner_unittest.cpp index ccc14ef..990dcb2 100644 --- a/tests/scanner_unittest.cpp +++ b/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; diff --git a/tests/server_unittest.cpp b/tests/server_unittest.cpp index 41d9e14..68f1429 100644 --- a/tests/server_unittest.cpp +++ b/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; |