diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-14 21:41:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-14 21:41:06 +0000 |
| commit | 9ac0177da562b8f4d2ac6f001a16658a76e6aad8 (patch) | |
| tree | 9943178b96589f9bbd684d410e02425ca292db09 /include | |
| parent | 102b17b8276f1f364f214f5d943d887f61f71765 (diff) | |
| parent | 0e8a3284c6828e561f58e66a014c3b7ee37325cf (diff) | |
| download | frameworks_av-9ac0177da562b8f4d2ac6f001a16658a76e6aad8.zip frameworks_av-9ac0177da562b8f4d2ac6f001a16658a76e6aad8.tar.gz frameworks_av-9ac0177da562b8f4d2ac6f001a16658a76e6aad8.tar.bz2 | |
am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-dev
automerge: 0e8a328
* commit '0e8a3284c6828e561f58e66a014c3b7ee37325cf':
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, |