summaryrefslogtreecommitdiffstats
path: root/scanning/hidden_network.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-08 16:57:18 -0700
committerXin Li <delphij@google.com>2020-09-08 16:57:18 -0700
commiteaf7c4998d15c61360bdcd716fb02b33acd8b526 (patch)
tree7535ac3f76cce213db2f66501107c5e68c4830e3 /scanning/hidden_network.cpp
parent0bcc0e4488989dad285c7664b4cdaa6eaad666d4 (diff)
parent7e90494ad7cd8b2a5f52781a636ae34af1904c97 (diff)
downloadplatform_system_connectivity_wificond-master.tar.gz
platform_system_connectivity_wificond-master.tar.bz2
platform_system_connectivity_wificond-master.zip
Merge Android RHEADmaster
Bug: 168057903 Merged-In: I3b0a326c6381091e8721811fb5ea352e6af1031f Change-Id: Id8a690a46c023b26372220ab8878b86b2b881eeb
Diffstat (limited to 'scanning/hidden_network.cpp')
-rw-r--r--scanning/hidden_network.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/scanning/hidden_network.cpp b/scanning/hidden_network.cpp
index 686d5da..ce35b69 100644
--- a/scanning/hidden_network.cpp
+++ b/scanning/hidden_network.cpp
@@ -22,11 +22,10 @@
using android::status_t;
-namespace com {
namespace android {
-namespace server {
+namespace net {
namespace wifi {
-namespace wificond {
+namespace nl80211 {
status_t HiddenNetwork::writeToParcel(::android::Parcel* parcel) const {
RETURN_IF_FAILED(parcel->writeByteVector(ssid_));
@@ -38,8 +37,7 @@ status_t HiddenNetwork::readFromParcel(const ::android::Parcel* parcel) {
return ::android::OK;
}
-} // namespace wificond
+} // namespace nl80211
} // namespace wifi
-} // namespace server
+} // namespace net
} // namespace android
-} // namespace com