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

Commit 77109420 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Audio: Use uid_t for uids"

parents eb6300d4 1f12a8ad

include/media/AudioRecord.h

+3 −3
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public: 
                                    audio_session_t sessionId = AUDIO_SESSION_ALLOCATE,

                                    transfer_type transferType = TRANSFER_DEFAULT,

                                    audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE,

                                    int uid = -1,

                                    uid_t uid = AUDIO_UID_INVALID,

                                    pid_t pid = -1,

                                    const audio_attributes_t* pAttributes = NULL);
@@ -218,7 +218,7 @@ public: 
                            audio_session_t sessionId = AUDIO_SESSION_ALLOCATE,

                            transfer_type transferType = TRANSFER_DEFAULT,

                            audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE,

                            int uid = -1,

                            uid_t uid = AUDIO_UID_INVALID,

                            pid_t pid = -1,

                            const audio_attributes_t* pAttributes = NULL);
@@ -642,7 +642,7 @@ private: 


    sp<DeathNotifier>       mDeathNotifier;

    uint32_t                mSequence;              // incremented for each new IAudioRecord attempt

    int                     mClientUid;

    uid_t                   mClientUid;

    pid_t                   mClientPid;

    audio_attributes_t      mAttributes;

include/media/AudioTrack.h

+4 −4
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ public: 
                                    audio_session_t sessionId  = AUDIO_SESSION_ALLOCATE,

                                    transfer_type transferType = TRANSFER_DEFAULT,

                                    const audio_offload_info_t *offloadInfo = NULL,

                                    int uid = -1,

                                    uid_t uid = AUDIO_UID_INVALID,

                                    pid_t pid = -1,

                                    const audio_attributes_t* pAttributes = NULL,

                                    bool doNotReconnect = false,
@@ -263,7 +263,7 @@ public: 
                                    audio_session_t sessionId   = AUDIO_SESSION_ALLOCATE,

                                    transfer_type transferType = TRANSFER_DEFAULT,

                                    const audio_offload_info_t *offloadInfo = NULL,

                                    int uid = -1,

                                    uid_t uid = AUDIO_UID_INVALID,

                                    pid_t pid = -1,

                                    const audio_attributes_t* pAttributes = NULL,

                                    bool doNotReconnect = false,
@@ -309,7 +309,7 @@ public: 
                            audio_session_t sessionId  = AUDIO_SESSION_ALLOCATE,

                            transfer_type transferType = TRANSFER_DEFAULT,

                            const audio_offload_info_t *offloadInfo = NULL,

                            int uid = -1,

                            uid_t uid = AUDIO_UID_INVALID,

                            pid_t pid = -1,

                            const audio_attributes_t* pAttributes = NULL,

                            bool doNotReconnect = false,
@@ -1130,7 +1130,7 @@ private: 


    sp<DeathNotifier>       mDeathNotifier;

    uint32_t                mSequence;              // incremented for each new IAudioTrack attempt

    int                     mClientUid;

    uid_t                   mClientUid;

    pid_t                   mClientPid;



    sp<AudioSystem::AudioDeviceCallback> mDeviceCallback;

media/libaudioclient/AudioRecord.cpp

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ AudioRecord::AudioRecord( 
        audio_session_t sessionId,

        transfer_type transferType,

        audio_input_flags_t flags,

        int uid,

        uid_t uid,

        pid_t pid,

        const audio_attributes_t* pAttributes)

    : mActive(false),
@@ -143,7 +143,7 @@ status_t AudioRecord::set( 
        audio_session_t sessionId,

        transfer_type transferType,

        audio_input_flags_t flags,

        int uid,

        uid_t uid,

        pid_t pid,

        const audio_attributes_t* pAttributes)

{
@@ -236,7 +236,7 @@ status_t AudioRecord::set( 


    int callingpid = IPCThreadState::self()->getCallingPid();

    int mypid = getpid();

    if (uid == -1 || (callingpid != mypid)) {

    if (uid == AUDIO_UID_INVALID || (callingpid != mypid)) {

        mClientUid = IPCThreadState::self()->getCallingUid();

    } else {

        mClientUid = uid;

media/libaudioclient/AudioTrack.cpp

+4 −4
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ AudioTrack::AudioTrack( 
        audio_session_t sessionId,

        transfer_type transferType,

        const audio_offload_info_t *offloadInfo,

        int uid,

        uid_t uid,

        pid_t pid,

        const audio_attributes_t* pAttributes,

        bool doNotReconnect,
@@ -235,7 +235,7 @@ AudioTrack::AudioTrack( 
        audio_session_t sessionId,

        transfer_type transferType,

        const audio_offload_info_t *offloadInfo,

        int uid,

        uid_t uid,

        pid_t pid,

        const audio_attributes_t* pAttributes,

        bool doNotReconnect,
@@ -296,7 +296,7 @@ status_t AudioTrack::set( 
        audio_session_t sessionId,

        transfer_type transferType,

        const audio_offload_info_t *offloadInfo,

        int uid,

        uid_t uid,

        pid_t pid,

        const audio_attributes_t* pAttributes,

        bool doNotReconnect,
@@ -490,7 +490,7 @@ status_t AudioTrack::set( 
    }

    int callingpid = IPCThreadState::self()->getCallingPid();

    int mypid = getpid();

    if (uid == -1 || (callingpid != mypid)) {

    if (uid == AUDIO_UID_INVALID || (callingpid != mypid)) {

        mClientUid = IPCThreadState::self()->getCallingUid();

    } else {

        mClientUid = uid;

services/audioflinger/PlaybackTracks.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public: 
                                void *buffer,

                                const sp<IMemory>& sharedBuffer,

                                audio_session_t sessionId,

                                int uid,

                                uid_t uid,

                                audio_output_flags_t flags,

                                track_type type);

    virtual             ~Track();
@@ -188,7 +188,7 @@ public: 
                                audio_format_t format,

                                audio_channel_mask_t channelMask,

                                size_t frameCount,

                                int uid);

                                uid_t uid);

    virtual             ~OutputTrack();



    virtual status_t    start(AudioSystem::sync_event_t event =