diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-07-17 18:25:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-17 18:25:11 +0000 |
| commit | 0c85c651e2024c1b8dc80b06b5bc863786d490a2 (patch) | |
| tree | 899ebebd4c2711fdd894d9d5ef339e5e3f040227 | |
| parent | 3124f3a5949a18ff544d2d521f64834022f23086 (diff) | |
| parent | 1ebe760d8c2d5205a6f1a616ebbb31ba3e733e54 (diff) | |
| download | wlan-0c85c651e2024c1b8dc80b06b5bc863786d490a2.tar.gz | |
Merge "remove extraneous `using namespace android` and deprecate utils/Log.h" am: 5c73d53b0f am: 84029467a8 am: 6015b57ae1
am: 1ebe760d8c
Change-Id: Iefe24721e7465e0000d4bd7b3d8e4c9141db1184
| -rw-r--r-- | bcmdhd/wifi_hal/wifi_logger.cpp | 4 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/wifi_offload.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/bcmdhd/wifi_hal/wifi_logger.cpp b/bcmdhd/wifi_hal/wifi_logger.cpp index e5b40c4..6924017 100644 --- a/bcmdhd/wifi_hal/wifi_logger.cpp +++ b/bcmdhd/wifi_hal/wifi_logger.cpp @@ -21,14 +21,12 @@ #define LOG_TAG "WifiHAL" -#include <utils/Log.h> +#include <log/log.h> #include "wifi_hal.h" #include "common.h" #include "cpp_bindings.h" -using namespace android; - typedef enum { LOGGER_START_LOGGING = ANDROID_NL80211_SUBCMD_DEBUG_RANGE_START, LOGGER_TRIGGER_MEM_DUMP, diff --git a/bcmdhd/wifi_hal/wifi_offload.cpp b/bcmdhd/wifi_hal/wifi_offload.cpp index e1013f5..52891c7 100644 --- a/bcmdhd/wifi_hal/wifi_offload.cpp +++ b/bcmdhd/wifi_hal/wifi_offload.cpp @@ -22,14 +22,12 @@ #define LOG_TAG "WifiHAL" -#include <utils/Log.h> +#include <log/log.h> #include "wifi_hal.h" #include "common.h" #include "cpp_bindings.h" -using namespace android; - typedef enum { WIFI_OFFLOAD_START_MKEEP_ALIVE = ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_START, WIFI_OFFLOAD_STOP_MKEEP_ALIVE, |