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

Commit 4d18ed11 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ifc1efbee,Ib8c71eaf into rvc-dev am: f4cabacb am: 71d61746 

Change-Id: Ibe5177441d6bccd73743761b8586fc873782914d
parents 4ca011df 71d61746

media/utils/TimeCheck.cpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ void TimeCheck::TimeCheckThread::stopMonitoring(nsecs_t endTimeNs) { 
bool TimeCheck::TimeCheckThread::threadLoop()

{

    status_t status = TIMED_OUT;

    const char *tag;

    {

        AutoMutex _l(mMutex);
@@ -109,6 +108,7 @@ bool TimeCheck::TimeCheckThread::threadLoop() 
        }



        nsecs_t endTimeNs = INT64_MAX;

        const char *tag = "<unspecified>";

        // KeyedVector mMonitorRequests is ordered so take first entry as next timeout

        if (mMonitorRequests.size() != 0) {

            endTimeNs = mMonitorRequests.keyAt(0);

services/audioflinger/Effects.cpp

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ status_t AudioFlinger::EffectBase::updatePolicyState() 
    bool registered = false;

    bool doEnable = false;

    bool enabled = false;

    audio_io_handle_t io;

    audio_io_handle_t io = AUDIO_IO_HANDLE_NONE;

    uint32_t strategy;



    {