Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e17eb61d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't store a pointer to internal SensorManager"

parents 0a8b1ce1 93ec6f2a

services/sensorservice/aidl/SensorManager.cpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -185,13 +185,9 @@ ndk::ScopedAStatus SensorManagerAidl::getSensorList(std::vector<SensorInfo>* _ai 
}

}





::android::SensorManager& SensorManagerAidl::getInternalManager() {

::android::SensorManager& SensorManagerAidl::getInternalManager() {

    std::lock_guard<std::mutex> lock(mInternalManagerMutex);

    return ::android::SensorManager::getInstanceForPackage(

    if (mInternalManager == nullptr) {

        mInternalManager = &::android::SensorManager::getInstanceForPackage(

            String16(ISensorManager::descriptor));

            String16(ISensorManager::descriptor));

}

}

    return *mInternalManager;

}





/* One global looper for all event queues created from this SensorManager. */

/* One global looper for all event queues created from this SensorManager. */

sp<Looper> SensorManagerAidl::getLooper() {

sp<Looper> SensorManagerAidl::getLooper() {

services/sensorservice/aidl/include/sensorserviceaidl/SensorManagerAidl.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,6 @@ private: 
    ::android::SensorManager& getInternalManager();

    ::android::SensorManager& getInternalManager();

    sp<Looper> getLooper();

    sp<Looper> getLooper();





    std::mutex mInternalManagerMutex;

    ::android::SensorManager* mInternalManager = nullptr; // does not own

    sp<Looper> mLooper;

    sp<Looper> mLooper;





    volatile bool mStopThread;

    volatile bool mStopThread;

services/sensorservice/hidl/SensorManager.cpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -193,13 +193,9 @@ sp<Looper> SensorManager::getLooper() { 
}

}





::android::SensorManager& SensorManager::getInternalManager() {

::android::SensorManager& SensorManager::getInternalManager() {

    std::lock_guard<std::mutex> lock(mInternalManagerMutex);

    return ::android::SensorManager::getInstanceForPackage(

    if (mInternalManager == nullptr) {

        mInternalManager = &::android::SensorManager::getInstanceForPackage(

            String16(ISensorManager::descriptor));

            String16(ISensorManager::descriptor));

}

}

    return *mInternalManager;

}





Return<void> SensorManager::createEventQueue(

Return<void> SensorManager::createEventQueue(

        const sp<IEventQueueCallback> &callback, createEventQueue_cb _hidl_cb) {

        const sp<IEventQueueCallback> &callback, createEventQueue_cb _hidl_cb) {

services/sensorservice/hidl/include/sensorservicehidl/SensorManager.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -58,8 +58,6 @@ private: 
    ::android::SensorManager& getInternalManager();

    ::android::SensorManager& getInternalManager();

    sp<Looper> getLooper();

    sp<Looper> getLooper();





    std::mutex mInternalManagerMutex;

    ::android::SensorManager* mInternalManager = nullptr; // does not own

    sp<Looper> mLooper;

    sp<Looper> mLooper;





    volatile bool mStopThread;

    volatile bool mStopThread;