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

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

Merge "IDirectReport.configure returns token" into oc-dev

parents 1636e003 c7cbda64

services/sensorservice/hidl/DirectReportChannel.cpp

+5 −2
Original line number Diff line number Diff line
@@ -31,10 +31,13 @@ DirectReportChannel::~DirectReportChannel() { 
}



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

Return<Result> DirectReportChannel::configure(int32_t sensorHandle, RateLevel rate) {

Return<void> DirectReportChannel::configure(int32_t sensorHandle, RateLevel rate,

        configure_cb _hidl_cb) {

    int token = mManager.configureDirectChannel(mId,

            static_cast<int>(sensorHandle), static_cast<int>(rate));

    return token <= 0 ? convertResult(token) : Result::OK;

    _hidl_cb(token <= 0 ? 0 : token,

             token <= 0 ? convertResult(token) : Result::OK);

    return Void();

}

services/sensorservice/hidl/DirectReportChannel.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ struct DirectReportChannel final : public IDirectReportChannel { 
    ~DirectReportChannel();



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

    Return<Result> configure(int32_t sensorHandle, RateLevel rate) override;

    Return<void> configure(int32_t sensorHandle, RateLevel rate,

            configure_cb _hidl_cb) override;



private:

    ::android::SensorManager& mManager;