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

Commit 9587b947 authored by Weilin Xu's avatar Weilin Xu Committed by Android (Google) Code Review
Browse files

Merge "Check secondary ids in bcradio HAL utils isValid methods" into main

parents 3e153bf6 1b6c03d7

broadcastradio/common/utilsaidl/src/Utils.cpp

+6 −1
Original line number Diff line number Diff line
@@ -296,7 +296,12 @@ bool isValid(const ProgramSelector& sel) { 
         sel.primaryId.type > IdentifierType::VENDOR_END)) {

        return false;

    }

    return isValid(sel.primaryId);

    for (auto it = begin(sel); it != end(sel); it++) {

        if (!isValid(*it)) {

            return false;

        }

    }

    return true;

}



ProgramIdentifier makeIdentifier(IdentifierType type, int64_t value) {

broadcastradio/common/utilsaidl/src/UtilsV2.cpp

+6 −1
Original line number Diff line number Diff line
@@ -135,7 +135,12 @@ bool isValidV2(const ProgramSelector& sel) { 
         sel.primaryId.type > IdentifierType::VENDOR_END)) {

        return false;

    }

    return isValidV2(sel.primaryId);

    for (auto it = begin(sel); it != end(sel); it++) {

        if (!isValidV2(*it)) {

            return false;

        }

    }

    return true;

}



bool isValidMetadataV2(const Metadata& metadata) {