diff options
4 files changed, 4 insertions, 16 deletions
diff --git a/services/sensorservice/aidl/SensorManager.cpp b/services/sensorservice/aidl/SensorManager.cpp index 9b0334443b..b7aecdf1bd 100644 --- a/services/sensorservice/aidl/SensorManager.cpp +++ b/services/sensorservice/aidl/SensorManager.cpp @@ -185,12 +185,8 @@ ndk::ScopedAStatus SensorManagerAidl::getSensorList(std::vector<SensorInfo>* _ai } ::android::SensorManager& SensorManagerAidl::getInternalManager() { - std::lock_guard<std::mutex> lock(mInternalManagerMutex); - if (mInternalManager == nullptr) { - mInternalManager = &::android::SensorManager::getInstanceForPackage( - String16(ISensorManager::descriptor)); - } - return *mInternalManager; + return ::android::SensorManager::getInstanceForPackage( + String16(ISensorManager::descriptor)); } /* One global looper for all event queues created from this SensorManager. */ diff --git a/services/sensorservice/aidl/include/sensorserviceaidl/SensorManagerAidl.h b/services/sensorservice/aidl/include/sensorserviceaidl/SensorManagerAidl.h index c77ee880dd..83496f6012 100644 --- a/services/sensorservice/aidl/include/sensorserviceaidl/SensorManagerAidl.h +++ b/services/sensorservice/aidl/include/sensorserviceaidl/SensorManagerAidl.h @@ -57,8 +57,6 @@ private: ::android::SensorManager& getInternalManager(); sp<Looper> getLooper(); - std::mutex mInternalManagerMutex; - ::android::SensorManager* mInternalManager = nullptr; // does not own sp<Looper> mLooper; volatile bool mStopThread; diff --git a/services/sensorservice/hidl/SensorManager.cpp b/services/sensorservice/hidl/SensorManager.cpp index 938060063f..f04712c534 100644 --- a/services/sensorservice/hidl/SensorManager.cpp +++ b/services/sensorservice/hidl/SensorManager.cpp @@ -193,12 +193,8 @@ sp<Looper> SensorManager::getLooper() { } ::android::SensorManager& SensorManager::getInternalManager() { - std::lock_guard<std::mutex> lock(mInternalManagerMutex); - if (mInternalManager == nullptr) { - mInternalManager = &::android::SensorManager::getInstanceForPackage( - String16(ISensorManager::descriptor)); - } - return *mInternalManager; + return ::android::SensorManager::getInstanceForPackage( + String16(ISensorManager::descriptor)); } Return<void> SensorManager::createEventQueue( diff --git a/services/sensorservice/hidl/include/sensorservicehidl/SensorManager.h b/services/sensorservice/hidl/include/sensorservicehidl/SensorManager.h index 8d7a05b5e2..1b085acfca 100644 --- a/services/sensorservice/hidl/include/sensorservicehidl/SensorManager.h +++ b/services/sensorservice/hidl/include/sensorservicehidl/SensorManager.h @@ -58,8 +58,6 @@ private: ::android::SensorManager& getInternalManager(); sp<Looper> getLooper(); - std::mutex mInternalManagerMutex; - ::android::SensorManager* mInternalManager = nullptr; // does not own sp<Looper> mLooper; volatile bool mStopThread; |