commit badb70a2cce8d6a5d9c9cb2a00bbbd6b2edbae39
author Colin Cross <ccross@android.com> Wed May 03 21:52:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 21:52:03 2017 +0000
tree 62f39e629699254c2e71b025b862925827142f52
parent ed566c401ff959cd8a6ef15b7be12a47218e97df
parent d1d43e67742ff489a159ea51ebf4608b69a98ded

Merge "Mark functions in headers with static inline" am: 1c9d60cd6f
am: d1d43e6774

Change-Id: Ia19e19b32f0dd250f5c5591c2c6f064eee650309

include/media/AudioPolicyHelper.h

diff --git a/include/media/AudioPolicyHelper.h b/include/media/AudioPolicyHelper.h
index 79231be..d39aa20 100644
--- a/include/media/AudioPolicyHelper.h
+++ b/include/media/AudioPolicyHelper.h
@@ -18,7 +18,8 @@
 
 #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
     if ((attr->flags & AUDIO_FLAG_AUDIBILITY_ENFORCED) == AUDIO_FLAG_AUDIBILITY_ENFORCED) {
@@ -61,7 +62,8 @@
     }
 }
 
-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) {
     memset(attr, 0, sizeof(audio_attributes_t));