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

Commit d1d43e67 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Mark functions in headers with static inline" 

am: 1c9d60cd

Change-Id: Ia0352244441cd51a68f4dff437a87507199b5eac
parents 46b2135b 1c9d60cd

include/media/AudioPolicyHelper.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,8 @@ 




#include <system/audio.h>

#include <system/audio.h>





static audio_stream_type_t audio_attributes_to_stream_type(const audio_attributes_t *attr)

static inline

audio_stream_type_t audio_attributes_to_stream_type(const audio_attributes_t *attr)

{

{

    // flags to stream type mapping

    // flags to stream type mapping

    if ((attr->flags & AUDIO_FLAG_AUDIBILITY_ENFORCED) == AUDIO_FLAG_AUDIBILITY_ENFORCED) {

    if ((attr->flags & AUDIO_FLAG_AUDIBILITY_ENFORCED) == AUDIO_FLAG_AUDIBILITY_ENFORCED) {
@@ -61,7 +62,8 @@ static audio_stream_type_t audio_attributes_to_stream_type(const audio_attribute 
    }

    }

}

}





static void stream_type_to_audio_attributes(audio_stream_type_t streamType,

static inline

void stream_type_to_audio_attributes(audio_stream_type_t streamType,

                                     audio_attributes_t *attr) {

                                     audio_attributes_t *attr) {

    memset(attr, 0, sizeof(audio_attributes_t));

    memset(attr, 0, sizeof(audio_attributes_t));