Merge Android RHEADmaster

Bug: 168057903
Merged-In: I3b0a326c6381091e8721811fb5ea352e6af1031f
Change-Id: Id8a690a46c023b26372220ab8878b86b2b881eeb

1 files changed, 6 insertions, 8 deletions

diff --git a/scanning/single_scan_settings.cpp b/scanning/single_scan_settings.cpp
index fa6a079..ec89259 100644
--- a/scanning/single_scan_settings.cpp
+++ b/scanning/single_scan_settings.cpp
@@ -14,21 +14,20 @@
  * limitations under the License.
  */
 
-#include "android/net/wifi/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::IWifiScannerImpl;
+using android::net::wifi::nl80211::IWifiScannerImpl;
 using android::status_t;
 
-namespace com {
 namespace android {
-namespace server {
+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 ||
@@ -109,8 +108,7 @@ status_t SingleScanSettings::readFromParcel(const ::android::Parcel* parcel) {
   return ::android::OK;
 }
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
-}  // namespace server
+}  // namespace net
 }  // namespace android
-}  // namespace com