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

Commit 19ff85c4 authored by Daniel Chapin's avatar Daniel Chapin Committed by Android (Google) Code Review
Browse files

Merge "Revert "Added update device info playback configuration""

parents da207843 d0ab5db4

include/audiomanager/AudioManager.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ typedef enum { 
    PLAYER_STATE_STARTED  = 2,

    PLAYER_STATE_PAUSED   = 3,

    PLAYER_STATE_STOPPED  = 4,

    PLAYER_UPDATE_DEVICE_ID = 5,

} player_state_t;



// must be kept in sync with definitions in AudioManager.java

include/audiomanager/IAudioManager.h

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ public: 
                audio_content_type_t content, const sp<IBinder>& player) = 0;

    /*oneway*/ virtual status_t playerAttributes(audio_unique_id_t piid, audio_usage_t usage,

                audio_content_type_t content)= 0;

    /*oneway*/ virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event,

                audio_port_handle_t deviceId) = 0;

    /*oneway*/ virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event) = 0;

    /*oneway*/ virtual status_t releasePlayer(audio_unique_id_t piid) = 0;

    virtual audio_unique_id_t trackRecorder(const sp<IBinder>& recorder) = 0;

    /*oneway*/ virtual status_t recorderEvent(audio_unique_id_t riid, recorder_state_t event) = 0;

services/audiomanager/IAudioManager.cpp

+1 −3
Original line number Diff line number Diff line
@@ -84,13 +84,11 @@ public: 
        return remote()->transact(PLAYER_ATTRIBUTES, data, &reply, IBinder::FLAG_ONEWAY);

    }



    virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event,

            audio_port_handle_t deviceId) {

    virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event) {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioManager::getInterfaceDescriptor());

        data.writeInt32((int32_t) piid);

        data.writeInt32((int32_t) event);

        data.writeInt32((int32_t) deviceId);

        return remote()->transact(PLAYER_EVENT, data, &reply, IBinder::FLAG_ONEWAY);

    }