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

Commit d21b200c authored by Connor O'Brien's avatar Connor O'Brien Committed by Android (Google) Code Review
Browse files

Merge "Remove length arg from transmit() in IR HAL"

parents 86beb712 542a11b4

ir/1.0/IConsumerIr.hal

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ interface IConsumerIr { 
     *

     *

     * returns: true on success, false on error.

     * returns: true on success, false on error.

     */

     */

    transmit(int32_t carrierFreq, vec<int32_t> pattern, int32_t patternLen) generates (bool success);

    transmit(int32_t carrierFreq, vec<int32_t> pattern) generates (bool success);





    /*

    /*

     * getCarrierFreqs() enumerates which frequencies the IR transmitter supports.

     * getCarrierFreqs() enumerates which frequencies the IR transmitter supports.

ir/1.0/default/ConsumerIr.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +32,8 @@ ConsumerIr::ConsumerIr(consumerir_device_t *device) { 
}

}





// Methods from ::android::hardware::consumerir::V1_0::IConsumerIr follow.

// Methods from ::android::hardware::consumerir::V1_0::IConsumerIr follow.

Return<bool> ConsumerIr::transmit(int32_t carrierFreq, const hidl_vec<int32_t>& pattern, int32_t patternLen) {

Return<bool> ConsumerIr::transmit(int32_t carrierFreq, const hidl_vec<int32_t>& pattern) {

    return mDevice->transmit(mDevice, carrierFreq, pattern.data(), patternLen) == 0;

    return mDevice->transmit(mDevice, carrierFreq, pattern.data(), pattern.size()) == 0;

}

}





Return<void> ConsumerIr::getCarrierFreqs(getCarrierFreqs_cb _hidl_cb) {

Return<void> ConsumerIr::getCarrierFreqs(getCarrierFreqs_cb _hidl_cb) {

ir/1.0/default/ConsumerIr.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ using ::android::sp; 
struct ConsumerIr : public IConsumerIr {

struct ConsumerIr : public IConsumerIr {

    ConsumerIr(consumerir_device_t *device);

    ConsumerIr(consumerir_device_t *device);

    // Methods from ::android::hardware::ir::V1_0::IConsumerIr follow.

    // Methods from ::android::hardware::ir::V1_0::IConsumerIr follow.

    Return<bool> transmit(int32_t carrierFreq, const hidl_vec<int32_t>& pattern, int32_t patternLen) override;

    Return<bool> transmit(int32_t carrierFreq, const hidl_vec<int32_t>& pattern) override;

    Return<void> getCarrierFreqs(getCarrierFreqs_cb _hidl_cb) override;

    Return<void> getCarrierFreqs(getCarrierFreqs_cb _hidl_cb) override;

private:

private:

    consumerir_device_t *mDevice;

    consumerir_device_t *mDevice;