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

Commit e7a74461 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents 4c7beb13 1d9246e8

core/java/android/content/res/Resources.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class Resources { 
    // Use the current SDK version code.  If we are a development build,

    // also allow the previous SDK version + 1.

    private static final int sSdkVersion = Build.VERSION.SDK_INT

            + ("REL".equals(Build.VERSION.CODENAME) ? 1 : 0);

            + ("REL".equals(Build.VERSION.CODENAME) ? 0 : 1);

    private static final Object mSync = new Object();

    private static Resources mSystem = null;

include/media/AudioSystem.h

+2 −1
Original line number Diff line number Diff line
@@ -257,11 +257,12 @@ public: 
        DEVICE_IN_WIRED_HEADSET = 0x100000,

        DEVICE_IN_AUX_DIGITAL = 0x200000,

        DEVICE_IN_VOICE_CALL = 0x400000,

        DEVICE_IN_BACK_MIC = 0x800000,

        DEVICE_IN_DEFAULT = 0x80000000,



        DEVICE_IN_ALL = (DEVICE_IN_COMMUNICATION | DEVICE_IN_AMBIENT | DEVICE_IN_BUILTIN_MIC |

                DEVICE_IN_BLUETOOTH_SCO_HEADSET | DEVICE_IN_WIRED_HEADSET | DEVICE_IN_AUX_DIGITAL |

                DEVICE_IN_VOICE_CALL| DEVICE_IN_DEFAULT)

                DEVICE_IN_VOICE_CALL | DEVICE_IN_BACK_MIC | DEVICE_IN_DEFAULT)

    };



    // device connection states used for setDeviceConnectionState()

include/media/mediarecorder.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ enum audio_source { 
    AUDIO_SOURCE_VOICE_UPLINK = 2,

    AUDIO_SOURCE_VOICE_DOWNLINK = 3,

    AUDIO_SOURCE_VOICE_CALL = 4,

    AUDIO_SOURCE_MAX = AUDIO_SOURCE_VOICE_CALL,

    AUDIO_SOURCE_CAMCORDER = 5,

    AUDIO_SOURCE_MAX = AUDIO_SOURCE_CAMCORDER,



    AUDIO_SOURCE_LIST_END  // must be last - used to validate audio source type

};

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;

                }

            }