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

Commit 19c11e1c authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev

parents 112c72a9 6eb954f5

media/libmedia/ToneGenerator.cpp

+5 −1
Original line number Diff line number Diff line
@@ -885,6 +885,11 @@ bool ToneGenerator::startTone(tone_type toneType, int durationMs) { 
    if ((toneType < 0) || (toneType >= NUM_TONES))

        return lResult;



    toneType = getToneForRegion(toneType);

    if (toneType == TONE_CDMA_SIGNAL_OFF) {

        return true;

    }



    if (mState == TONE_IDLE) {

        ALOGV("startTone: try to re-init AudioTrack");

        if (!initAudioTrack()) {
@@ -897,7 +902,6 @@ bool ToneGenerator::startTone(tone_type toneType, int durationMs) { 
    mLock.lock();



    // Get descriptor for requested tone

    toneType = getToneForRegion(toneType);

    mpNewToneDesc = &sToneDescriptors[toneType];



    mDurationMs = durationMs;