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

Commit 68f4d479 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12770256 from 7dfeaa17 to 25Q1-release 

Change-Id: I46bbd050415957d17d0a7e386af43478e2448080
parents f62d811c 7dfeaa17

media/audioaidlconversion/AidlConversionCppNdk.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ namespace { 
    // Use '01' for LSB bits 0 and 1 as Bluetooth MAC addresses are never multicast

    // and universaly administered

    constexpr std::array<uint8_t, 4> BTANON_PREFIX {0xFD, 0xFF, 0xFF, 0xFF};

    // Keep sync with ServiceUtilities.cpp mustAnonymizeBluetoothAddress

    // Keep sync with ServiceUtilities.cpp anonymizeBluetoothAddress

    constexpr const char * BTANON_PREFIX_STR = "XX:XX:XX:XX:";

}

media/libstagefright/MPEG4Writer.cpp

+13 −3
Original line number Diff line number Diff line
@@ -4212,13 +4212,23 @@ status_t MPEG4Writer::Track::threadEntry() { 
                trackProgressStatus(timestampUs);

            }

        }

        if (!hasMultipleTracks || isGainmapMeta || isGainmap) {



        if (flags_camera::camera_heif_gainmap() && mOwner->mHasGainmap) {

            Mutex::Autolock lock(mOwner->mLock);

            size_t bytesWritten;

            off64_t offset = mOwner->addSample_l(copy, usePrefix, tiffHdrOffset, &bytesWritten);

            addItemOffsetAndSize(offset, bytesWritten, isExif, isGainmapMeta, isGainmap);

            copy->release();

            copy = NULL;

            continue;

        }



        if (!hasMultipleTracks) {

            size_t bytesWritten;

            off64_t offset = mOwner->addSample_l(

                    copy, usePrefix, tiffHdrOffset, &bytesWritten);



            if (mIsHeif) {

                addItemOffsetAndSize(offset, bytesWritten, isExif, isGainmapMeta, isGainmap);

                addItemOffsetAndSize(offset, bytesWritten, isExif);

            } else {

                if (mCo64TableEntries->count() == 0) {

                    addChunkOffset(offset);

media/utils/ServiceUtilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ bool checkBluetoothPermission(const AttributionSourceState& attr) { 
 * @param caller string identifying the caller for logging.

 * @return true if the MAC addresses must be anonymized, false otherwise.

 */

bool mustAnonymizeBluetoothAddress(

bool mustAnonymizeBluetoothAddressLegacy(

        const AttributionSourceState& attributionSource, const String16&) {

    uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));

    bool res;

media/utils/include/mediautils/ServiceUtilities.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ bool modifyPhoneStateAllowed(const AttributionSourceState& attributionSource); 
bool bypassInterruptionPolicyAllowed(const AttributionSourceState& attributionSource);

bool callAudioInterceptionAllowed(const AttributionSourceState& attributionSource);

void purgePermissionCache();

bool mustAnonymizeBluetoothAddress(

bool mustAnonymizeBluetoothAddressLegacy(

        const AttributionSourceState& attributionSource, const String16& caller);

void anonymizeBluetoothAddress(char *address);

services/audioflinger/Threads.cpp

+2 −1
Original line number Diff line number Diff line
@@ -8034,7 +8034,8 @@ void DuplicatingThread::removeOutputTrack(IAfPlaybackThread* thread) 
// caller must hold mutex()

void DuplicatingThread::updateWaitTime_l()

{

    mWaitTimeMs = UINT_MAX;

    // Initialize mWaitTimeMs according to the mixer buffer size.

    mWaitTimeMs = mNormalFrameCount * 2 * 1000 / mSampleRate;

    for (size_t i = 0; i < mOutputTracks.size(); i++) {

        const auto strong = mOutputTracks[i]->thread().promote();

        if (strong != 0) {