summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioSystem.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-26 20:44:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-26 20:44:49 +0000
commit8c7b9fb41585fccb06573252823b929c82a40999 (patch)
treeb15b9c23c2440bf1df24350f1034064016110897 /media/libmedia/AudioSystem.cpp
parentf7f21b93bfce562784ee8f632fb01a2f8e4ffa6b (diff)
parent241618f1b286f9e7e02fe61e96d9194e2e1e8a7a (diff)
downloadframeworks_av-8c7b9fb41585fccb06573252823b929c82a40999.zip
frameworks_av-8c7b9fb41585fccb06573252823b929c82a40999.tar.gz
frameworks_av-8c7b9fb41585fccb06573252823b929c82a40999.tar.bz2
Merge "Remove streamType parameter from AudioSystem::getLatency()"
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
-rw-r--r--media/libmedia/AudioSystem.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index c418466..195aadf 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -333,11 +333,10 @@ status_t AudioSystem::getOutputLatency(uint32_t* latency, audio_stream_type_t st
return PERMISSION_DENIED;
}
- return getLatency(output, streamType, latency);
+ return getLatency(output, latency);
}
status_t AudioSystem::getLatency(audio_io_handle_t output,
- audio_stream_type_t streamType __unused,
uint32_t* latency)
{
OutputDescriptor *outputDesc;
@@ -354,7 +353,7 @@ status_t AudioSystem::getLatency(audio_io_handle_t output,
gLock.unlock();
}
- ALOGV("getLatency() streamType %d, output %d, latency %d", streamType, output, *latency);
+ ALOGV("getLatency() output %d, latency %d", output, *latency);
return NO_ERROR;
}