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

Commit 7a84dfc8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ir impl point fixes" am: d6344807 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2278696



Change-Id: Ic038bc6e5f73929613b81a09f62b906f3c07d449
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76ecedd9 d6344807

ir/aidl/default/main.cpp

+4 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class ConsumerIr : public BnConsumerIr { 
    ::ndk::ScopedAStatus getCarrierFreqs(std::vector<ConsumerIrFreqRange>* _aidl_return) override;

    ::ndk::ScopedAStatus transmit(int32_t in_carrierFreqHz,

                                  const std::vector<int32_t>& in_pattern) override;

    consumerir_device_t *mDevice;

    consumerir_device_t *mDevice = nullptr;

};



ConsumerIr::ConsumerIr() {
@@ -49,7 +49,10 @@ ConsumerIr::ConsumerIr() { 
    }

    ret = hw_module->methods->open(hw_module, CONSUMERIR_TRANSMITTER, (hw_device_t **) &mDevice);

    if (ret < 0) {

        // note - may want to make this a fatal error - otherwise the service will crash when it's used

        ALOGE("Can't open consumer IR transmitter, error: %d", ret);

        // in case it's modified

        mDevice = nullptr;

    }

}