summaryrefslogtreecommitdiffstats
path: root/include/media/AudioSystem.h
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-04-30 16:43:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 16:43:21 +0000
commitd641af3e9faf6c053ccbeea1bc20790021e57a11 (patch)
treef2c1fa01f2321024396ac4bda949d74965a547f9 /include/media/AudioSystem.h
parentd707ac5a0494398cb1306ead0ba587034f610f30 (diff)
parentf613d42b12389335b2ecf06df18d0d095d6bfd44 (diff)
downloadframeworks_av-d641af3e9faf6c053ccbeea1bc20790021e57a11.zip
frameworks_av-d641af3e9faf6c053ccbeea1bc20790021e57a11.tar.gz
frameworks_av-d641af3e9faf6c053ccbeea1bc20790021e57a11.tar.bz2
Merge "AudioSystem callback for dynamic policy mix activity" into mnc-dev
Diffstat (limited to 'include/media/AudioSystem.h')
-rw-r--r--include/media/AudioSystem.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index a454481..debfd35 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -29,6 +29,7 @@
namespace android {
typedef void (*audio_error_callback)(status_t err);
+typedef void (*dynamic_policy_callback)(int event, String8 regId, int val);
class IAudioFlinger;
class IAudioPolicyService;
@@ -89,6 +90,7 @@ public:
static String8 getParameters(const String8& keys);
static void setErrorCallback(audio_error_callback cb);
+ static void setDynPolicyCallback(dynamic_policy_callback cb);
// helper function to obtain AudioFlinger service handle
static const sp<IAudioFlinger> get_audio_flinger();
@@ -409,6 +411,7 @@ private:
static Mutex gLockAPS; // protects gAudioPolicyService and gAudioPolicyServiceClient
static sp<IAudioFlinger> gAudioFlinger;
static audio_error_callback gAudioErrorCallback;
+ static dynamic_policy_callback gDynPolicyCallback;
static size_t gInBuffSize;
// previous parameters for recording buffer size queries