wifi: refactor package import
refactor codes according to below rules:
1. don't import the whole namespace
2. only import base type
3. use derived type explictly
Fixes: 141895518
Bug: 141895518
Test: supplicant vts tests
Change-Id: I0072c9cab54467c87cc6556122ce2df629894d3e
diff --git a/wpa_supplicant/hidl/1.3/hidl.cpp b/wpa_supplicant/hidl/1.3/hidl.cpp
index 986fc10..a04126d 100644
--- a/wpa_supplicant/hidl/1.3/hidl.cpp
+++ b/wpa_supplicant/hidl/1.3/hidl.cpp
@@ -24,8 +24,9 @@
using android::hardware::configureRpcThreadpool;
using android::hardware::handleTransportPoll;
using android::hardware::setupTransportPolling;
+using android::hardware::wifi::supplicant::V1_2::DppFailureCode;
+using android::hardware::wifi::supplicant::V1_2::DppProgressCode;
using android::hardware::wifi::supplicant::V1_3::implementation::HidlManager;
-using namespace android::hardware::wifi::supplicant::V1_2;
static void wpas_hidl_notify_dpp_failure(struct wpa_supplicant *wpa_s, DppFailureCode code);
static void wpas_hidl_notify_dpp_progress(struct wpa_supplicant *wpa_s, DppProgressCode code);
diff --git a/wpa_supplicant/hidl/1.3/hidl_manager.cpp b/wpa_supplicant/hidl/1.3/hidl_manager.cpp
index 559d13d..18c1c89 100644
--- a/wpa_supplicant/hidl/1.3/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.3/hidl_manager.cpp
@@ -21,7 +21,6 @@
namespace {
using android::hardware::hidl_array;
-using namespace android::hardware::wifi::supplicant::V1_2;
constexpr uint8_t kWfdDeviceInfoLen = 6;
// GSM-AUTH:<RAND1>:<RAND2>[:<RAND3>]
@@ -404,7 +403,6 @@
namespace V1_3 {
namespace implementation {
-using namespace android::hardware::wifi::supplicant::V1_2;
using V1_0::ISupplicantStaIfaceCallback;
HidlManager *HidlManager::instance_ = NULL;
@@ -1600,7 +1598,7 @@
* @return 0 on success, 1 on failure.
*/
int HidlManager::getStaIfaceHidlObjectByIfname(
- const std::string &ifname, android::sp<ISupplicantStaIface> *iface_object)
+ const std::string &ifname, android::sp<V1_1::ISupplicantStaIface> *iface_object)
{
if (ifname.empty() || !iface_object)
return 1;
diff --git a/wpa_supplicant/hidl/1.3/hidl_manager.h b/wpa_supplicant/hidl/1.3/hidl_manager.h
index 07e3066..1040b0c 100644
--- a/wpa_supplicant/hidl/1.3/hidl_manager.h
+++ b/wpa_supplicant/hidl/1.3/hidl_manager.h
@@ -16,7 +16,7 @@
#include <android/hardware/wifi/supplicant/1.0/ISupplicantCallback.h>
#include <android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.h>
#include <android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.h>
-#include <android/hardware/wifi/supplicant/1.3/ISupplicantStaIfaceCallback.h>
+#include <android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.h>
#include <android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.h>
#include "p2p_iface.h"
@@ -40,12 +40,12 @@
namespace supplicant {
namespace V1_3 {
namespace implementation {
-using namespace android::hardware::wifi::supplicant::V1_2;
+using V1_0::ISupplicant;
using V1_0::ISupplicantP2pIface;
+using V1_0::ISupplicantStaIface;
using V1_0::ISupplicantStaIfaceCallback;
-using V1_1::ISupplicant;
-using V1_1::ISupplicantStaIface;
-using V1_2::ISupplicantStaNetwork;
+using V1_0::P2pGroupCapabilityMask;
+using V1_0::WpsConfigMethods;
/**
* HidlManager is responsible for managing the lifetime of all
diff --git a/wpa_supplicant/hidl/1.3/hidl_return_util.h b/wpa_supplicant/hidl/1.3/hidl_return_util.h
index 28da1d9..4c1f919 100644
--- a/wpa_supplicant/hidl/1.3/hidl_return_util.h
+++ b/wpa_supplicant/hidl/1.3/hidl_return_util.h
@@ -17,6 +17,7 @@
namespace V1_3 {
namespace implementation {
namespace hidl_return_util {
+using V1_0::SupplicantStatusCode;
/**
* These utility functions are used to invoke a method on the provided
diff --git a/wpa_supplicant/hidl/1.3/p2p_iface.cpp b/wpa_supplicant/hidl/1.3/p2p_iface.cpp
index 18a2054..e750531 100644
--- a/wpa_supplicant/hidl/1.3/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/1.3/p2p_iface.cpp
@@ -386,6 +386,7 @@
namespace V1_3 {
namespace implementation {
using hidl_return_util::validateAndCall;
+using V1_0::SupplicantStatusCode;
P2pIface::P2pIface(struct wpa_global* wpa_global, const char ifname[])
: wpa_global_(wpa_global), ifname_(ifname), is_valid_(true)
diff --git a/wpa_supplicant/hidl/1.3/p2p_iface.h b/wpa_supplicant/hidl/1.3/p2p_iface.h
index dc4fbb4..608dbd4 100644
--- a/wpa_supplicant/hidl/1.3/p2p_iface.h
+++ b/wpa_supplicant/hidl/1.3/p2p_iface.h
@@ -36,8 +36,11 @@
namespace supplicant {
namespace V1_3 {
namespace implementation {
-using namespace android::hardware::wifi::supplicant::V1_0;
-using namespace android::hardware::wifi::supplicant::V1_1;
+using V1_0::SupplicantNetworkId;
+using V1_0::SupplicantStatus;
+using V1_0::IfaceType;
+using V1_0::ISupplicantP2pIfaceCallback;
+using V1_0::ISupplicantP2pNetwork;
/**
* Implementation of P2pIface hidl object. Each unique hidl
diff --git a/wpa_supplicant/hidl/1.3/p2p_network.cpp b/wpa_supplicant/hidl/1.3/p2p_network.cpp
index e489a0c..c87e4c0 100644
--- a/wpa_supplicant/hidl/1.3/p2p_network.cpp
+++ b/wpa_supplicant/hidl/1.3/p2p_network.cpp
@@ -23,6 +23,7 @@
namespace V1_3 {
namespace implementation {
using hidl_return_util::validateAndCall;
+using V1_0::SupplicantStatusCode;
P2pNetwork::P2pNetwork(
struct wpa_global *wpa_global, const char ifname[], int network_id)
diff --git a/wpa_supplicant/hidl/1.3/p2p_network.h b/wpa_supplicant/hidl/1.3/p2p_network.h
index 9e5c8a9..8c134b0 100644
--- a/wpa_supplicant/hidl/1.3/p2p_network.h
+++ b/wpa_supplicant/hidl/1.3/p2p_network.h
@@ -28,8 +28,8 @@
namespace supplicant {
namespace V1_3 {
namespace implementation {
-using namespace android::hardware::wifi::supplicant::V1_0;
-using namespace android::hardware::wifi::supplicant::V1_1;
+using V1_0::ISupplicantP2pNetwork;
+using V1_0::ISupplicantP2pNetworkCallback;
/**
* Implementation of P2pNetwork hidl object. Each unique hidl
diff --git a/wpa_supplicant/hidl/1.3/sta_iface.cpp b/wpa_supplicant/hidl/1.3/sta_iface.cpp
index 03e32a2..249eebc 100644
--- a/wpa_supplicant/hidl/1.3/sta_iface.cpp
+++ b/wpa_supplicant/hidl/1.3/sta_iface.cpp
@@ -29,7 +29,7 @@
namespace {
using android::hardware::wifi::supplicant::V1_0::SupplicantStatus;
using android::hardware::wifi::supplicant::V1_0::SupplicantStatusCode;
-using android::hardware::wifi::supplicant::V1_3::ISupplicantStaIface;
+using android::hardware::wifi::supplicant::V1_0::ISupplicantStaIface;
using android::hardware::wifi::supplicant::V1_3::implementation::HidlManager;
constexpr uint32_t kMaxAnqpElems = 100;
@@ -163,9 +163,6 @@
namespace V1_3 {
namespace implementation {
using hidl_return_util::validateAndCall;
-
-using namespace android::hardware::wifi::supplicant::V1_0;
-using namespace android::hardware::wifi::supplicant::V1_1;
using V1_0::ISupplicantStaIfaceCallback;
StaIface::StaIface(struct wpa_global *wpa_global, const char ifname[])
diff --git a/wpa_supplicant/hidl/1.3/sta_iface.h b/wpa_supplicant/hidl/1.3/sta_iface.h
index fbd91e6..b425bec 100644
--- a/wpa_supplicant/hidl/1.3/sta_iface.h
+++ b/wpa_supplicant/hidl/1.3/sta_iface.h
@@ -35,7 +35,7 @@
namespace supplicant {
namespace V1_3 {
namespace implementation {
-using namespace android::hardware::wifi::supplicant::V1_3;
+using V1_0::ISupplicantNetwork;
using android::hardware::wifi::supplicant::V1_2::DppAkm;
using android::hardware::wifi::supplicant::V1_2::DppNetRole;
diff --git a/wpa_supplicant/hidl/1.3/sta_network.cpp b/wpa_supplicant/hidl/1.3/sta_network.cpp
index 4209a97..f3320a2 100644
--- a/wpa_supplicant/hidl/1.3/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.3/sta_network.cpp
@@ -19,8 +19,9 @@
namespace {
using android::hardware::wifi::supplicant::V1_0::SupplicantStatus;
-using android::hardware::wifi::supplicant::V1_2::ISupplicantStaNetwork;
-using namespace android::hardware::wifi::supplicant::V1_2;
+using android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork;
+using ISupplicantStaNetworkV1_2 = android::hardware::wifi::supplicant::V1_2::ISupplicantStaNetwork;
+using ISupplicantStaNetworkV1_3 = android::hardware::wifi::supplicant::V1_3::ISupplicantStaNetwork;
constexpr uint8_t kZeroBssid[6] = {0, 0, 0, 0, 0, 0};
@@ -32,11 +33,11 @@
static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::FT_EAP) |
static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::FT_PSK) |
static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::OSEN) |
- static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::SAE) |
- static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::SUITE_B_192) |
- static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::OWE) |
- static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::WPA_PSK_SHA256) |
- static_cast<uint32_t>(ISupplicantStaNetwork::KeyMgmtMask::WPA_EAP_SHA256));
+ static_cast<uint32_t>(ISupplicantStaNetworkV1_2::KeyMgmtMask::SAE) |
+ static_cast<uint32_t>(ISupplicantStaNetworkV1_2::KeyMgmtMask::SUITE_B_192) |
+ static_cast<uint32_t>(ISupplicantStaNetworkV1_2::KeyMgmtMask::OWE) |
+ static_cast<uint32_t>(ISupplicantStaNetworkV1_2::KeyMgmtMask::WPA_PSK_SHA256) |
+ static_cast<uint32_t>(ISupplicantStaNetworkV1_2::KeyMgmtMask::WPA_EAP_SHA256));
constexpr uint32_t kAllowedProtoMask =
(static_cast<uint32_t>(ISupplicantStaNetwork::ProtoMask::WPA) |
static_cast<uint32_t>(ISupplicantStaNetwork::ProtoMask::RSN) |
@@ -52,20 +53,20 @@
static_cast<uint32_t>(ISupplicantStaNetwork::GroupCipherMask::CCMP) |
static_cast<uint32_t>(
ISupplicantStaNetwork::GroupCipherMask::GTK_NOT_USED) |
- static_cast<uint32_t>(ISupplicantStaNetwork::GroupCipherMask::GCMP_256));
+ static_cast<uint32_t>(ISupplicantStaNetworkV1_2::GroupCipherMask::GCMP_256));
constexpr uint32_t kAllowedPairwisewCipherMask =
(static_cast<uint32_t>(ISupplicantStaNetwork::PairwiseCipherMask::NONE) |
static_cast<uint32_t>(ISupplicantStaNetwork::PairwiseCipherMask::TKIP) |
static_cast<uint32_t>(ISupplicantStaNetwork::PairwiseCipherMask::CCMP) |
static_cast<uint32_t>(
- ISupplicantStaNetwork::PairwiseCipherMask::GCMP_256));
+ ISupplicantStaNetworkV1_2::PairwiseCipherMask::GCMP_256));
constexpr uint32_t kAllowedGroupMgmtCipherMask =
(static_cast<uint32_t>(
- ISupplicantStaNetwork::GroupMgmtCipherMask::BIP_GMAC_128) |
+ ISupplicantStaNetworkV1_2::GroupMgmtCipherMask::BIP_GMAC_128) |
static_cast<uint32_t>(
- ISupplicantStaNetwork::GroupMgmtCipherMask::BIP_GMAC_256) |
+ ISupplicantStaNetworkV1_2::GroupMgmtCipherMask::BIP_GMAC_256) |
static_cast<uint32_t>(
- ISupplicantStaNetwork::GroupMgmtCipherMask::BIP_CMAC_256));
+ ISupplicantStaNetworkV1_2::GroupMgmtCipherMask::BIP_CMAC_256));
constexpr uint32_t kEapMethodMax =
static_cast<uint32_t>(ISupplicantStaNetwork::EapMethod::WFA_UNAUTH_TLS) + 1;
@@ -92,6 +93,7 @@
namespace V1_3 {
namespace implementation {
using hidl_return_util::validateAndCall;
+using V1_0::SupplicantStatusCode;
StaNetwork::StaNetwork(
struct wpa_global *wpa_global, const char ifname[], int network_id)
diff --git a/wpa_supplicant/hidl/1.3/sta_network.h b/wpa_supplicant/hidl/1.3/sta_network.h
index 2db1b03..121d2e1 100644
--- a/wpa_supplicant/hidl/1.3/sta_network.h
+++ b/wpa_supplicant/hidl/1.3/sta_network.h
@@ -36,9 +36,9 @@
namespace supplicant {
namespace V1_3 {
namespace implementation {
-using namespace android::hardware::wifi::supplicant::V1_0;
-using namespace android::hardware::wifi::supplicant::V1_1;
-using namespace android::hardware::wifi::supplicant::V1_2;
+using V1_0::ISupplicantStaNetworkCallback;
+using V1_2::DppFailureCode;
+using V1_2::DppProgressCode;
/**
* Implementation of StaNetwork hidl object. Each unique hidl
diff --git a/wpa_supplicant/hidl/1.3/supplicant.cpp b/wpa_supplicant/hidl/1.3/supplicant.cpp
index 336c34e..50d2343 100644
--- a/wpa_supplicant/hidl/1.3/supplicant.cpp
+++ b/wpa_supplicant/hidl/1.3/supplicant.cpp
@@ -16,7 +16,6 @@
#include <sys/stat.h>
namespace {
-using namespace android::hardware::wifi::supplicant::V1_2;
// Pre-populated interface params for interfaces controlled by wpa_supplicant.
// Note: This may differ for other OEM's. So, modify this accordingly.
@@ -160,6 +159,7 @@
namespace V1_3 {
namespace implementation {
using hidl_return_util::validateAndCall;
+using V1_0::SupplicantStatusCode;
Supplicant::Supplicant(struct wpa_global* global) : wpa_global_(global) {}
bool Supplicant::isValid()
@@ -353,7 +353,7 @@
wpa_s->conf->persistent_reconnect = true;
return {{SupplicantStatusCode::SUCCESS, ""}, iface};
} else {
- android::sp<ISupplicantStaIface> iface;
+ android::sp<V1_1::ISupplicantStaIface> iface;
if (!hidl_manager ||
hidl_manager->getStaIfaceHidlObjectByIfname(
wpa_s->ifname, &iface)) {
diff --git a/wpa_supplicant/hidl/1.3/supplicant.h b/wpa_supplicant/hidl/1.3/supplicant.h
index 7315db2..0c0ac72 100644
--- a/wpa_supplicant/hidl/1.3/supplicant.h
+++ b/wpa_supplicant/hidl/1.3/supplicant.h
@@ -31,7 +31,8 @@
namespace supplicant {
namespace V1_3 {
namespace implementation {
-using namespace android::hardware::wifi::supplicant::V1_0;
+using V1_0::ISupplicantCallback;
+using V1_0::ISupplicantIface;
/**
* Implementation of the supplicant hidl object. This hidl