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

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

Snap for 6057338 from 73114b9b to rvc-release 

Change-Id: Idfb2060ef24809daaa2f0cd2cd5bcf5216515baf
parents e02b7aaf 73114b9b

media/codec2/vndk/platform/C2BqBuffer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -576,10 +576,11 @@ public: 
            }

        }

        int migrated = 0;

        // poolDatas dtor should not be called during lock is held.

        std::shared_ptr<C2BufferQueueBlockPoolData>

                poolDatas[NUM_BUFFER_SLOTS];

        {

            sp<GraphicBuffer> buffers[NUM_BUFFER_SLOTS];

            std::weak_ptr<C2BufferQueueBlockPoolData>

                    poolDatas[NUM_BUFFER_SLOTS];

            std::scoped_lock<std::mutex> lock(mMutex);

            bool noInit = false;

            for (int i = 0; i < NUM_BUFFER_SLOTS; ++i) {

services/audiopolicy/engine/common/include/LastRemovableMediaDevices.h

+52 −52

File changed.

Contains only whitespace changes.

services/audiopolicy/engine/common/src/LastRemovableMediaDevices.cpp

+78 −78

File changed.

Contains only whitespace changes.