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

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

Merge "IAudioManager: add audio session ID to trackPlayer()" into sc-dev

parents ca344844 bf28ea61

include/audiomanager/IAudioManager.h

+4 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public: 
        TRACK_RECORDER                        = IBinder::FIRST_CALL_TRANSACTION + 4,

        RECORDER_EVENT                        = IBinder::FIRST_CALL_TRANSACTION + 5,

        RELEASE_RECORDER                      = IBinder::FIRST_CALL_TRANSACTION + 6,

        PLAYER_SESSION_ID                     = IBinder::FIRST_CALL_TRANSACTION + 7,

    };



    DECLARE_META_INTERFACE(AudioManager)
@@ -46,7 +47,8 @@ public: 
    // The parcels created by these methods must be kept in sync with the

    // corresponding methods from IAudioService.aidl and objects it imports.

    virtual audio_unique_id_t trackPlayer(player_type_t playerType, audio_usage_t usage,

                audio_content_type_t content, const sp<IBinder>& player) = 0;

                audio_content_type_t content, const sp<IBinder>& player,

                audio_session_t sessionId) = 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,
@@ -55,6 +57,7 @@ public: 
    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;

    /*oneway*/ virtual status_t releaseRecorder(audio_unique_id_t riid) = 0;

    /*oneway*/ virtual status_t playerSessionId(audio_unique_id_t piid, audio_session_t sessionId) = 0;

};



// ----------------------------------------------------------------------------

services/audiomanager/IAudioManager.cpp

+11 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public: 
    }



    virtual audio_unique_id_t trackPlayer(player_type_t playerType, audio_usage_t usage,

            audio_content_type_t content, const sp<IBinder>& player) {

            audio_content_type_t content, const sp<IBinder>& player, audio_session_t sessionId) {

        Parcel data, reply;

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

        data.writeInt32(1); // non-null PlayerIdCard parcelable
@@ -54,6 +54,8 @@ public: 
        data.writeInt32(-1977 /*ATTR_PARCEL_IS_NULL_BUNDLE*/); // no bundle

        //   write IPlayer

        data.writeStrongBinder(player);

        //   write session Id

        data.writeInt32((int32_t)sessionId);

        // get new PIId in reply

        const status_t res = remote()->transact(TRACK_PLAYER, data, &reply, 0);

        if (res != OK || reply.readExceptionCode() != 0) {
@@ -131,6 +133,14 @@ public: 
        data.writeInt32((int32_t) riid);

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

    }



    virtual status_t playerSessionId(audio_unique_id_t piid, audio_session_t sessionId) {

        Parcel data, reply;

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

        data.writeInt32((int32_t) piid);

        data.writeInt32((int32_t) sessionId);

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

    }

};



IMPLEMENT_META_INTERFACE(AudioManager, "android.media.IAudioService");