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

Commit d7810308 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6182732 from 8cb9d016 to rvc-release 

Change-Id: I76cb4dc97b3693fd671ac4bb602cb3fccab2122e
parents 29177b84 8cb9d016

media/extractors/mp4/SampleTable.cpp

+2 −1
Original line number Diff line number Diff line
@@ -652,12 +652,13 @@ void SampleTable::buildSampleEntriesTable() { 
    }



    mSampleTimeEntries = new (std::nothrow) SampleTimeEntry[mNumSampleSizes];

    memset(mSampleTimeEntries, 0, sizeof(SampleTimeEntry) * mNumSampleSizes);



    if (!mSampleTimeEntries) {

        ALOGE("Cannot allocate sample entry table with %llu entries.",

                (unsigned long long)mNumSampleSizes);

        return;

    }

    memset(mSampleTimeEntries, 0, sizeof(SampleTimeEntry) * mNumSampleSizes);



    uint32_t sampleIndex = 0;

    uint64_t sampleTime = 0;

services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp

+3 −3
Original line number Diff line number Diff line
@@ -353,11 +353,11 @@ AudioPolicyMixCollection::MixMatchStatus AudioPolicyMixCollection::mixMatch( 
        // determine if exiting on success (or implicit failure as desc is 0)

        if (hasAddrMatch ||

                !((hasUsageExcludeRules && usageExclusionFound) ||

                  (hasUserIdExcludeRules && userIdExclusionFound) ||

                  (hasUsageMatchRules && !usageMatchFound)  ||

                  (hasUidExcludeRules && uidExclusionFound) ||

                  (hasUidMatchRules && !uidMatchFound)) ||

                  (hasUserIdMatchRules && !userIdMatchFound)) {

                  (hasUidMatchRules && !uidMatchFound) ||

                  (hasUserIdExcludeRules && userIdExclusionFound) ||

                  (hasUserIdMatchRules && !userIdMatchFound))) {

            ALOGV("\tgetOutputForAttr will use mix %zu", mixIndex);

            return MixMatchStatus::MATCH;

        }