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

Commit 99adeec0 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add isHighPriority scan message type into Tuner HAL 1.1"

parents 6708bf6a 7ec2b704

tv/tuner/1.1/default/Frontend.cpp

+4 −1
Original line number Diff line number Diff line
@@ -122,9 +122,12 @@ Return<Result> Frontend::scan(const FrontendSettings& settings, FrontendScanType 
            V1_1::IFrontendCallback::castFrom(mCallback);

    if (frontendCallback_v1_1 != NULL) {

        V1_1::FrontendScanMessageExt1_1 msg;

        msg.dvbc(FrontendDvbcModulation::MOD_16QAM);

        msg.modulation().dvbc(FrontendDvbcModulation::MOD_16QAM);

        frontendCallback_v1_1->onScanMessageExt1_1(V1_1::FrontendScanMessageTypeExt1_1::MODULATION,

                                                   msg);

        msg.isHighPriority(true);

        frontendCallback_v1_1->onScanMessageExt1_1(

                V1_1::FrontendScanMessageTypeExt1_1::HIGH_PRIORITY, msg);

    } else {

        ALOGD("[Filter] Couldn't cast to V1_1 IFrontendCallback");

    }

tv/tuner/1.1/types.hal

+6 −1
Original line number Diff line number Diff line
@@ -555,6 +555,11 @@ safe_union FrontendStatusExt1_1 { 


enum FrontendScanMessageTypeExt1_1 : uint32_t {

    MODULATION = @1.0::FrontendScanMessageType:ATSC3_PLP_INFO + 1,

    HIGH_PRIORITY,

};



typedef FrontendModulation FrontendScanMessageExt1_1;
 
safe_union FrontendScanMessageExt1_1 {

    FrontendModulation modulation;



    bool isHighPriority;

};

tv/tuner/1.1/vts/functional/FrontendTests.cpp

+6 −3
Original line number Diff line number Diff line
@@ -51,9 +51,12 @@ Return<void> FrontendCallback::onScanMessageExt1_1(FrontendScanMessageTypeExt1_1 
                                                   const FrontendScanMessageExt1_1& message) {

    android::Mutex::Autolock autoLock(mMsgLock);

    ALOGD("[vts] frontend ext1_1 scan message. Type: %d", type);

    switch (type) {

        case FrontendScanMessageTypeExt1_1::MODULATION:

            readFrontendScanMessageExt1_1Modulation(message);

    switch (message.getDiscriminator()) {

        case FrontendScanMessageExt1_1::hidl_discriminator::modulation:

            readFrontendScanMessageExt1_1Modulation(message.modulation());

            break;

        case FrontendScanMessageExt1_1::hidl_discriminator::isHighPriority:

            ALOGD("[vts] frontend ext1_1 scan message high priority: %d", message.isHighPriority());

            break;

        default:

            break;