| commit | 40cab3a33e7570df3ac74c6c81eda8d522e7cb3b | [log] [tgz] |
|---|---|---|
| author | Ashish Jain <ashishj@codeaurora.org> | Wed Mar 23 11:14:14 2016 +0530 |
| committer | Ashish Jain <ashishj@codeaurora.org> | Tue Mar 29 17:27:13 2016 +0530 |
| tree | ddb8e7c5917a46160d0e278deddbd86530925497 | |
| parent | d5088d0b4d952b3c66428cefba483a7b7c960931 [diff] [blame] |
policy-hal: enable custom audio policy -This change enable custom audio policy and also includes the fixes that went in to audio policy manager. audio policy: add support for external audio sources Change-Id: If5805d58a4356b2f681f1aabf54375f62b55b98a Add setMasterMono and getMasterMono Change-Id: I32dc1fcecf285967a61bd508af3bb299595db57d AudioPolicy: AudioOutputDescriptor set/get for patch handle Change-Id: I5bffecf7a157ec042d749064208bc6c279008542 AudioPolicyManager: force encoded surround setting Change-Id: I0f7a486bf1aa7a27f15cf220e2c75ef23f8f8536 audio: several fixes in audio routing callbacks Change-Id: Ieb0d9f92f563a40552eb31bc0499c8ac65f78ce4 audio policy: move volume table to XML file Change-Id: I78c91bc3378b6c47202abe7b5c1c1e011ff62eed AudioPolicy: capture sample rate 0 is route-specific default Change-Id: I7d193640572c08ab5e5f1ecfc8ad6d31635967dd audio policy: remove deserialization from policy objects Change-Id: I1ce798848f4657b37e47446c9fbdc63f7ed0390e DO NOT MERGE - audio policy: disable concurrent capture Change-Id: I9085918f1f7b12e28430958cceb768bb29c12bdb audio policy: select output with best sample format match Change-Id: I31981940be5d1c06d713d52187cfb0a7bf355773 audio policy: audio sessions on input descriptors Change-Id: I915a65989a7fd0d3cbe2fcf5a0aee2ea0df5f4f5 Call SoundTrigger::setCaptureState in AudioPoilcyManager::closeAllInputs Change-Id: I613434ecacce3ef03a657008fd94c314948ba2b8 Change-Id: Iee8ef2647691fe1167b95f19357f17c28f54bf0e
diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h index af8c2a8..160fabc 100644 --- a/policy_hal/AudioPolicyManager.h +++ b/policy_hal/AudioPolicyManager.h
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * Not a contribution. * * Copyright (C) 2009 The Android Open Source Project @@ -149,7 +149,9 @@ const audio_offload_info_t *offloadInfo); // Used for voip + voice concurrency usecase int mPrevPhoneState; +#ifdef VOICE_CONCURRENCY int mvoice_call_state; +#endif #ifdef RECORD_PLAY_CONCURRENCY // Used for record + playback concurrency bool mIsInputRequestOnProgress;