diff options
author | Eric Laurent <elaurent@google.com> | 2014-11-14 17:40:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-14 17:40:28 +0000 |
commit | 990dad996b748fdaa2041cc6d039e96ccfeae6fb (patch) | |
tree | 7456bb2af05b32fa76e611e26c689b13e32d13fc /include | |
parent | cede28e22bce0c92a6d139b51d2c007d2e3f6fca (diff) | |
parent | 0d6db582f2ccc9f8943c5f3965e2994b7d137158 (diff) | |
download | frameworks_av-990dad996b748fdaa2041cc6d039e96ccfeae6fb.zip frameworks_av-990dad996b748fdaa2041cc6d039e96ccfeae6fb.tar.gz frameworks_av-990dad996b748fdaa2041cc6d039e96ccfeae6fb.tar.bz2 |
Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-dev
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, |