commit 02de9a2a2ddc294cf46403f1fca55978eabbcfb3
author shreerag <shreerag@google.com> Thu Oct 05 20:39:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 05 20:39:59 2017 +0000
tree 0db098b7b616159055170f762bfa739665e9c133
parent 50bd84846a46611262763f6f7b197137420201ce
parent e903a4a9c94aace831e3a1983c3e1f726e70a2ff

bcm4343: Fix remote code excution vulnerability am: 7ef52f3faf am: f4b3739b36 am: 6ebd21e472
am: e903a4a9c9

Change-Id: Iab72eedbb574517193906baca439fa02ae231e7c

bcmdhd/wifi_hal/wifi_logger.cpp

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,

bcmdhd/wifi_hal/wifi_offload.cpp

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,