commit 8d0dd68b05a7a82d684ad78a0d33c8b9ddfc526f
author Tom Cherry <tomcherry@google.com> Thu Jul 13 22:47:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 22:47:03 2017 +0000
tree c1c5be35253826963cb07be1aadc7da8492c6751
parent 4c09f57e628bcbdf04f976d83c4fa424c5035e5d
parent 357552eb724722dc620c56d2151bdfad07467952

remove extraneous `using namespace android` and deprecate utils/Log.h
am: 357552eb72

Change-Id: I36120c44e85c9ac35fb44e6f200b0f4341343b94

media/libaaudio/src/client/IsochronousClockModel.cpp

diff --git a/media/libaaudio/src/client/IsochronousClockModel.cpp b/media/libaaudio/src/client/IsochronousClockModel.cpp
index 1de33bb..edf6e97 100644
--- a/media/libaaudio/src/client/IsochronousClockModel.cpp
+++ b/media/libaaudio/src/client/IsochronousClockModel.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "AAudio"
 //#define LOG_NDEBUG 0
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <stdint.h>
 
@@ -25,7 +25,6 @@
 
 #define MIN_LATENESS_NANOS (10 * AAUDIO_NANOS_PER_MICROSECOND)
 
-using namespace android;
 using namespace aaudio;
 
 IsochronousClockModel::IsochronousClockModel()

services/oboeservice/SharedMemoryProxy.cpp

diff --git a/services/oboeservice/SharedMemoryProxy.cpp b/services/oboeservice/SharedMemoryProxy.cpp
index fc4532c..c31557e 100644
--- a/services/oboeservice/SharedMemoryProxy.cpp
+++ b/services/oboeservice/SharedMemoryProxy.cpp
@@ -16,12 +16,11 @@
 
 #define LOG_TAG "AAudioService"
 //#define LOG_NDEBUG 0
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <aaudio/AAudio.h>
 #include "SharedMemoryProxy.h"
 
-using namespace android;
 using namespace aaudio;
 
 SharedMemoryProxy::~SharedMemoryProxy()