diff options
| author | Andy Hung <hunga@google.com> | 2015-06-02 15:40:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 15:40:47 +0000 |
| commit | 20d09f3d9a82dc4ce51824025ef7a465f62086d0 (patch) | |
| tree | 085ed7816a2e26ab82c463f20347952de4b37a61 /services | |
| parent | 054219874873b41f1c815552987c10465c34ba2b (diff) | |
| parent | 08945c44a97d3749cc48f860eb4e01e57183ad90 (diff) | |
| download | frameworks_av-20d09f3d9a82dc4ce51824025ef7a465f62086d0.zip frameworks_av-20d09f3d9a82dc4ce51824025ef7a465f62086d0.tar.gz frameworks_av-20d09f3d9a82dc4ce51824025ef7a465f62086d0.tar.bz2 | |
Merge "Add property to control audio offload with video content" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/managerdefault/AudioPolicyManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index 665cce9..82c9e55 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp @@ -2031,8 +2031,9 @@ bool AudioPolicyManager::isOffloadSupported(const audio_offload_info_t& offloadI } //TODO: enable audio offloading with video when ready - if (offloadInfo.has_video) - { + const bool allowOffloadWithVideo = + property_get_bool("audio.offload.video", false /* default_value */); + if (offloadInfo.has_video && !allowOffloadWithVideo) { ALOGV("isOffloadSupported: has_video == true, returning false"); return false; } |