commit 4baa5beab2054e0a15b70e9693c12f232510b2a0
author Brian Stack <bstack@google.com> Tue Sep 18 14:03:13 2018 -0700
committer Brian Stack <bstack@google.com> Wed Sep 19 16:41:57 2018 -0700
tree de0388c97f143962261f84280f6b3846a70a70e4
parent 84ae607b7a77f4b77b70052d39a46231893d045a

Remove "using namespace SensorServiceUtil"

The SensorService was polluting the android namespace by "using
namespace SensorServiceUtil".

Bug: 116026128
Test: Compiles, a_sns_test receives events
Change-Id: Iec353322cb73f48f7ac38a959730e85e8fd5bce0

services/sensorservice/SensorService.h

diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h
index f71723d..db945bb 100644
--- a/services/sensorservice/SensorService.h
+++ b/services/sensorservice/SensorService.h
@@ -59,7 +59,6 @@
 namespace android {
 // ---------------------------------------------------------------------------
 class SensorInterface;
-using namespace SensorServiceUtil;
 
 class SensorService :
         public BinderService<SensorService>,
@@ -277,7 +276,7 @@
     static uint8_t sHmacGlobalKey[128];
     static bool sHmacGlobalKeyIsValid;
 
-    SensorList mSensors;
+    SensorServiceUtil::SensorList mSensors;
     status_t mInitCheck;
 
     // Socket buffersize used to initialize BitTube. This size depends on whether batching is
@@ -294,7 +293,7 @@
     bool mWakeLockAcquired;
     sensors_event_t *mSensorEventBuffer, *mSensorEventScratch;
     wp<const SensorEventConnection> * mMapFlushEventsToConnections;
-    std::unordered_map<int, RecentEventLogger*> mRecentEvent;
+    std::unordered_map<int, SensorServiceUtil::RecentEventLogger*> mRecentEvent;
     SortedVector< wp<SensorDirectConnection> > mDirectConnections;
     Mode mCurrentOperatingMode;