diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-14 21:46:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 21:46:03 +0000 |
| commit | e5a9eb684921b75919b1a7fee97259b0ca48bd47 (patch) | |
| tree | 512caf94ac522512c557468d2eecdaf98ee6116d /include | |
| parent | b4daff987e347d2561e55be129146937d782258b (diff) | |
| parent | 9ac0177da562b8f4d2ac6f001a16658a76e6aad8 (diff) | |
| download | frameworks_av-e5a9eb684921b75919b1a7fee97259b0ca48bd47.zip frameworks_av-e5a9eb684921b75919b1a7fee97259b0ca48bd47.tar.gz frameworks_av-e5a9eb684921b75919b1a7fee97259b0ca48bd47.tar.bz2 | |
am 9ac0177d: am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-dev automerge: 0e8a328
* commit '9ac0177da562b8f4d2ac6f001a16658a76e6aad8':
remove AudioSystem::getOutputSamplingRateForAttr()
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 6a0f2a6..f3b7fbb 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -99,8 +99,6 @@ public: // to be non-zero if status == NO_ERROR static status_t getOutputSamplingRate(uint32_t* samplingRate, audio_stream_type_t stream); - static status_t getOutputSamplingRateForAttr(uint32_t* samplingRate, - const audio_attributes_t *attr); static status_t getOutputFrameCount(size_t* frameCount, audio_stream_type_t stream); static status_t getOutputLatency(uint32_t* latency, |