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

Commit 8df81580 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cache routed device in case returning null when switching device."

parents e5a1a62e 161b64fc

media/libmediaplayerservice/MediaPlayerService.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1622,6 +1622,7 @@ MediaPlayerService::AudioOutput::AudioOutput(audio_session_t sessionId, uid_t ui 
      mFlags(AUDIO_OUTPUT_FLAG_NONE),

      mVolumeHandler(new media::VolumeHandler()),

      mSelectedDeviceId(AUDIO_PORT_HANDLE_NONE),

      mRoutedDeviceId(AUDIO_PORT_HANDLE_NONE),

      mDeviceCallbackEnabled(false),

      mDeviceCallback(deviceCallback)

{
@@ -2368,10 +2369,10 @@ status_t MediaPlayerService::AudioOutput::getRoutedDeviceId(audio_port_handle_t* 
    ALOGV("getRoutedDeviceId");

    Mutex::Autolock lock(mLock);

    if (mTrack != 0) {

        *deviceId = mTrack->getRoutedDeviceId();

        return NO_ERROR;

        mRoutedDeviceId = mTrack->getRoutedDeviceId();

    }

    return NO_INIT;

    *deviceId = mRoutedDeviceId;

    return NO_ERROR;

}



status_t MediaPlayerService::AudioOutput::enableAudioDeviceCallback(bool enabled)

media/libmediaplayerservice/MediaPlayerService.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ class MediaPlayerService : public BnMediaPlayerService 
        audio_output_flags_t    mFlags;

        sp<media::VolumeHandler>       mVolumeHandler;

        audio_port_handle_t     mSelectedDeviceId;

        audio_port_handle_t     mRoutedDeviceId;

        bool                    mDeviceCallbackEnabled;

        wp<AudioSystem::AudioDeviceCallback>        mDeviceCallback;

        mutable Mutex           mLock;