shim: cleanup unnecessary ifdef in SensorManager.*

mtk/libshims/gui/SensorManager.cpp

@@ -39,8 +39,7 @@ namespace android {
 android::Mutex android::SensorManager::sLock;
 std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;
 
-#ifdef MTK_HARDWARE
-
+// MTK
 static const String8 packageName8("");
 
 
@@ -63,7 +62,7 @@ SensorManager::SensorManager()
 sp<SensorEventQueue> SensorManager::createEventQueue() {
 	return createEventQueue(packageName8, 0);
 }
-#endif  // MTK_HARDWARE
+// MTK
 
 SensorManager& SensorManager::getInstanceForPackage(const String16& packageName) {
     Mutex::Autolock _l(sLock);

mtk/libshims/gui/SensorManager.h

@@ -57,12 +57,11 @@ public:
     ssize_t getSensorList(Sensor const* const** list);
     ssize_t getDynamicSensorList(Vector<Sensor>& list);
     Sensor const* getDefaultSensor(int type);
-#ifdef MTK_HARDWARE
+
+    // MTK
     sp<SensorEventQueue> createEventQueue(String8 packageName, int mode = 0);
     sp<SensorEventQueue> createEventQueue();
-#else
-    sp<SensorEventQueue> createEventQueue(String8 packageName = String8(""), int mode = 0);
-#endif
+
     bool isDataInjectionEnabled();
 
 private:
@@ -71,9 +70,9 @@ private:
 
     SensorManager(const String16& opPackageName);
 
-#ifdef MTK_HARDWARE
+    // MTK
     SensorManager();
-#endif
+
 
     status_t assertStateLocked();
 
@@ -89,13 +88,12 @@ private:
     const String16 mOpPackageName;
 };
 
-#ifdef MTK_HARDWARE
-// be compatible with MTK Lollipop blobs
+// MTK
 extern "C" {
     extern android::Mutex _ZN7android9SingletonINS_13SensorManagerEE5sLockE;
     extern SensorManager *_ZN7android9SingletonINS_13SensorManagerEE9sInstanceE;
 }
-#endif  // MTK_HARDWARE
+// MTK
 
 
 // ----------------------------------------------------------------------------