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

Commit efbebcdf authored by Kensuke Miyagi's avatar Kensuke Miyagi Committed by Android (Google) Code Review
Browse files

Merge "Enable LnbCallback in hidl/aidl default tuner implementation"

parents b0a51841 afe17c50

tv/tuner/1.0/default/Lnb.cpp

+10 −2
Original line number Diff line number Diff line
@@ -33,9 +33,10 @@ Lnb::Lnb(int id) { 


Lnb::~Lnb() {}



Return<Result> Lnb::setCallback(const sp<ILnbCallback>& /* callback */) {

Return<Result> Lnb::setCallback(const sp<ILnbCallback>& callback) {

    ALOGV("%s", __FUNCTION__);



    mCallback = callback;

    return Result::SUCCESS;

}
@@ -57,9 +58,16 @@ Return<Result> Lnb::setSatellitePosition(LnbPosition /* position */) { 
    return Result::SUCCESS;

}



Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& /* diseqcMessage */) {

Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& diseqcMessage) {

    ALOGV("%s", __FUNCTION__);



    if (mCallback != nullptr) {

        // The correct implementation should be to return the response from the

        // device via onDiseqcMessage(). The below implementation is only to enable

        // testing for LnbCallbacks.

        ALOGV("[hidl] %s - this is for test purpose only, and must be replaced!", __FUNCTION__);

        mCallback->onDiseqcMessage(diseqcMessage);

    }

    return Result::SUCCESS;

}

tv/tuner/1.0/default/Lnb.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ class Lnb : public ILnb { 
  private:

    int mId;

    virtual ~Lnb();

    sp<ILnbCallback> mCallback;

};



}  // namespace implementation

tv/tuner/1.1/default/Lnb.cpp

+10 −2
Original line number Diff line number Diff line
@@ -33,9 +33,10 @@ Lnb::Lnb(int id) { 


Lnb::~Lnb() {}



Return<Result> Lnb::setCallback(const sp<ILnbCallback>& /* callback */) {

Return<Result> Lnb::setCallback(const sp<ILnbCallback>& callback) {

    ALOGV("%s", __FUNCTION__);



    mCallback = callback;

    return Result::SUCCESS;

}
@@ -57,9 +58,16 @@ Return<Result> Lnb::setSatellitePosition(LnbPosition /* position */) { 
    return Result::SUCCESS;

}



Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& /* diseqcMessage */) {

Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& diseqcMessage) {

    ALOGV("%s", __FUNCTION__);



    if (mCallback != nullptr) {

        // The correct implementation should be to return the response from the

        // device via onDiseqcMessage(). The below implementation is only to enable

        // testing for LnbCallbacks.

        ALOGV("[hidl] %s - this is for test purpose only, and must be replaced!", __FUNCTION__);

        mCallback->onDiseqcMessage(diseqcMessage);

    }

    return Result::SUCCESS;

}

tv/tuner/1.1/default/Lnb.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ class Lnb : public ILnb { 
  private:

    int mId;

    virtual ~Lnb();

    sp<ILnbCallback> mCallback;

};



}  // namespace implementation

tv/tuner/aidl/default/Lnb.cpp

+12 −2
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ Lnb::Lnb(int id) { 


Lnb::~Lnb() {}



::ndk::ScopedAStatus Lnb::setCallback(const std::shared_ptr<ILnbCallback>& /* in_callback */) {

::ndk::ScopedAStatus Lnb::setCallback(const std::shared_ptr<ILnbCallback>& in_callback) {

    ALOGV("%s", __FUNCTION__);



    mCallback = in_callback;



    return ::ndk::ScopedAStatus::ok();

}
@@ -58,9 +60,17 @@ Lnb::~Lnb() {} 
    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus Lnb::sendDiseqcMessage(const std::vector<uint8_t>& /* in_diseqcMessage */) {

::ndk::ScopedAStatus Lnb::sendDiseqcMessage(const std::vector<uint8_t>& in_diseqcMessage) {

    ALOGV("%s", __FUNCTION__);



    if (mCallback != nullptr) {

        // The correct implementation should be to return the response from the

        // device via onDiseqcMessage(). The below implementation is only to enable

        // testing for LnbCallbacks.

        ALOGV("[aidl] %s - this is for test purpose only, and must be replaced!", __FUNCTION__);

        mCallback->onDiseqcMessage(in_diseqcMessage);

    }



    return ::ndk::ScopedAStatus::ok();

}