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

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

Merge "Don't modify -1 sensorHandle value" into rvc-dev

parents ee01c9ec cd4d9abd

sensors/common/default/2.X/multihal/HalProxy.cpp

+7 −2
Original line number Diff line number Diff line
@@ -260,9 +260,14 @@ Return<void> HalProxy::configDirectReport(int32_t sensorHandle, int32_t channelH 
                                          RateLevel rate, configDirectReport_cb _hidl_cb) {

    if (mDirectChannelSubHal == nullptr) {

        _hidl_cb(Result::INVALID_OPERATION, -1 /* reportToken */);

    } else if (sensorHandle == -1 && rate != RateLevel::STOP) {

        _hidl_cb(Result::BAD_VALUE, -1 /* reportToken */);

    } else {

        mDirectChannelSubHal->configDirectReport(clearSubHalIndex(sensorHandle), channelHandle,

                                                 rate, _hidl_cb);

        // -1 denotes all sensors should be disabled

        if (sensorHandle != -1) {

            sensorHandle = clearSubHalIndex(sensorHandle);

        }

        mDirectChannelSubHal->configDirectReport(sensorHandle, channelHandle, rate, _hidl_cb);

    }

    return Return<void>();

}