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

Commit 1f6c6b78 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Mass merge from gingerbread - do not merge 

Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
parents db207461 e091b1ca

media/libmedia/Visualizer.cpp

+7 −2
Original line number Diff line number Diff line
@@ -219,8 +219,13 @@ status_t Visualizer::doFft(uint8_t *fft, uint8_t *waveform) 
    }



    for (uint32_t i = 0; i < mCaptureSize; i += 2) {

        fft[i] = workspace[i >> 1] >> 24;

        fft[i + 1] = workspace[i >> 1] >> 8;

        short tmp = workspace[i >> 1] >> 21;

        while (tmp > 127 || tmp < -128) tmp >>= 1;

        fft[i] = tmp;

        tmp = workspace[i >> 1];

        tmp >>= 5;

        while (tmp > 127 || tmp < -128) tmp >>= 1;

        fft[i + 1] = tmp;

    }



    return NO_ERROR;

services/audioflinger/AudioPolicyManagerBase.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1835,7 +1835,8 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand 
        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE |

        AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET |

        AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)) &&

        (getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) &&

        ((getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) ||

         (stream == AudioSystem::SYSTEM)) &&

        streamDesc.mCanBeMuted) {

        volume *= SONIFICATION_HEADSET_VOLUME_FACTOR;

        // when the phone is ringing we must consider that music could have been paused just before