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

Commit c118b749 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Renamed HIDL SensorManager::mManager -> mInternalManager. am: 57d42773 

am: 5689b7f4

Change-Id: I01b936529d1b21405c4132da1138deaa32197327
parents ad92551b 5689b7f4

services/sensorservice/hidl/SensorManager.cpp

+5 −5
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ using ::android::hardware::Void; 
using ::android::sp;



SensorManager::SensorManager()

        : mManager{::android::SensorManager::getInstanceForPackage(

        : mInternalManager{::android::SensorManager::getInstanceForPackage(

            String16(ISensorManager::descriptor))} {

}



// Methods from ::android::frameworks::sensorservice::V1_0::ISensorManager follow.

Return<void> SensorManager::getSensorList(getSensorList_cb _hidl_cb) {

    ::android::Sensor const* const* list;

    ssize_t count = mManager.getSensorList(&list);

    ssize_t count = mInternalManager.getSensorList(&list);

    if (count < 0 || !list) {

        LOG(ERROR) << "::android::SensorManager::getSensorList encounters " << count;

        _hidl_cb({}, Result::UNKNOWN_ERROR);
@@ -59,7 +59,7 @@ Return<void> SensorManager::getSensorList(getSensorList_cb _hidl_cb) { 
}



Return<void> SensorManager::getDefaultSensor(SensorType type, getDefaultSensor_cb _hidl_cb) {

    ::android::Sensor const* sensor = mManager.getDefaultSensor(static_cast<int>(type));

    ::android::Sensor const* sensor = mInternalManager.getDefaultSensor(static_cast<int>(type));

    if (!sensor) {

        _hidl_cb({}, Result::NOT_EXIST);

        return Void();
@@ -95,7 +95,7 @@ Return<void> SensorManager::createAshmemDirectChannel( 
        return Void();

    }



    createDirectChannel(mManager, size, SENSOR_DIRECT_MEM_TYPE_ASHMEM,

    createDirectChannel(mInternalManager, size, SENSOR_DIRECT_MEM_TYPE_ASHMEM,

            mem.handle(), _hidl_cb);



    return Void();
@@ -105,7 +105,7 @@ Return<void> SensorManager::createGrallocDirectChannel( 
        const hidl_handle& buffer, uint64_t size,

        createGrallocDirectChannel_cb _hidl_cb) {



    createDirectChannel(mManager, size, SENSOR_DIRECT_MEM_TYPE_GRALLOC,

    createDirectChannel(mInternalManager, size, SENSOR_DIRECT_MEM_TYPE_GRALLOC,

            buffer.getNativeHandle(), _hidl_cb);



    return Void();

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct SensorManager : public ISensorManager { 
    Return<void> createGrallocDirectChannel(const hidl_handle& buffer, uint64_t size, createGrallocDirectChannel_cb _hidl_cb) override;

    Return<void> createEventQueue(const sp<IEventQueueCallback> &callback, createEventQueue_cb _hidl_cb);

private:

    ::android::SensorManager& mManager;

    ::android::SensorManager& mInternalManager;



};