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

Commit 9cc22e5a authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents 3645609c a9888b50

include/utils/ResourceTypes.h

+2 −2
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ struct ResTable_config 


            if (version || o.version) {

                if ((sdkVersion != o.sdkVersion) && requested->sdkVersion) {

                    return (sdkVersion);

                    return (sdkVersion > o.sdkVersion);

                }



                if ((minorVersion != o.minorVersion) &&
@@ -1384,7 +1384,7 @@ struct ResTable_config 
        }

        if (version != 0) {

            if (settings.sdkVersion != 0 && sdkVersion != 0

                && sdkVersion != settings.sdkVersion) {

                && sdkVersion > settings.sdkVersion) {

                return false;

            }

            if (settings.minorVersion != 0 && minorVersion != 0

libs/audioflinger/AudioFlinger.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ AudioFlinger::MixerThread::~MixerThread() 


bool AudioFlinger::MixerThread::threadLoop()

{

    uint32_t sleepTime = 0;

    uint32_t sleepTime = 1000;

    uint32_t maxBufferRecoveryInUsecs = getMaxBufferRecoveryInUsecs();

    int16_t* curBuf = mMixBuffer;

    Vector< sp<Track> > tracksToRemove;
@@ -1224,6 +1224,7 @@ bool AudioFlinger::MixerThread::threadLoop() 
                    }



                    standbyTime = systemTime() + kStandbyTimeInNsecs;

                    sleepTime = 1000;

                    continue;

                }

            }
@@ -1591,7 +1592,7 @@ AudioFlinger::DirectOutputThread::~DirectOutputThread() 


bool AudioFlinger::DirectOutputThread::threadLoop()

{

    uint32_t sleepTime = 0;

    uint32_t sleepTime = 1000;

    uint32_t maxBufferRecoveryInUsecs = getMaxBufferRecoveryInUsecs();

    sp<Track> trackToRemove;

    sp<Track> activeTrack;
@@ -1643,6 +1644,7 @@ bool AudioFlinger::DirectOutputThread::threadLoop() 
                    }



                    standbyTime = systemTime() + kStandbyTimeInNsecs;

                    sleepTime = 1000;

                    continue;

                }

            }
@@ -1879,7 +1881,7 @@ AudioFlinger::DuplicatingThread::~DuplicatingThread() 


bool AudioFlinger::DuplicatingThread::threadLoop()

{

    uint32_t sleepTime = 0;

    uint32_t sleepTime = 1000;

    uint32_t maxBufferRecoveryInUsecs = getMaxBufferRecoveryInUsecs();

    int16_t* curBuf = mMixBuffer;

    Vector< sp<Track> > tracksToRemove;
@@ -1940,6 +1942,7 @@ bool AudioFlinger::DuplicatingThread::threadLoop() 
                    }



                    standbyTime = systemTime() + kStandbyTimeInNsecs;

                    sleepTime = 1000;

                    continue;

                }

            }