diff options
| author | Eric Laurent <elaurent@google.com> | 2015-04-13 13:47:33 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-04-13 13:47:33 -0700 |
| commit | ab300c8cbf5df98fddca39e8d1698b0307432152 (patch) | |
| tree | 083c508fb62b4456a2c903045a165d9ef001b8fb /services/audiopolicy | |
| parent | 31ffe45a22b72ee5d25bb4932d0525e90dbc19fe (diff) | |
| download | frameworks_av-ab300c8cbf5df98fddca39e8d1698b0307432152.zip frameworks_av-ab300c8cbf5df98fddca39e8d1698b0307432152.tar.gz frameworks_av-ab300c8cbf5df98fddca39e8d1698b0307432152.tar.bz2 | |
audio polciy: remove FM audio capture permission.
Change-Id: I2607d89b0bd87cdd2f4084dfdb55135509a824d5
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp | 3 | ||||
| -rw-r--r-- | services/audiopolicy/service/AudioPolicyInterfaceImplLegacy.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp index a763151..9510727 100644 --- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp +++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp @@ -262,8 +262,7 @@ status_t AudioPolicyService::getInputForAttr(const audio_attributes_t *attr, return BAD_VALUE; } - if (((attr->source == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) || - ((attr->source == AUDIO_SOURCE_FM_TUNER) && !captureFmTunerAllowed())) { + if ((attr->source == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) { return BAD_VALUE; } sp<AudioPolicyEffects>audioPolicyEffects; diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImplLegacy.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImplLegacy.cpp index 372a9fa..e4ca5dc 100644 --- a/services/audiopolicy/service/AudioPolicyInterfaceImplLegacy.cpp +++ b/services/audiopolicy/service/AudioPolicyInterfaceImplLegacy.cpp @@ -255,8 +255,7 @@ status_t AudioPolicyService::getInputForAttr(const audio_attributes_t *attr, inputSource = AUDIO_SOURCE_MIC; } - if (((inputSource == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) || - ((inputSource == AUDIO_SOURCE_FM_TUNER) && !captureFmTunerAllowed())) { + if ((inputSource == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) { return BAD_VALUE; } |