summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2010-04-20 14:41:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-20 14:41:11 -0700
commitab1f72796859235f52c1b9ada0419fe292c4a6a5 (patch)
treefa431264cb5d0a404dded5b9eeaa71b79c94d276
parent0ff72102204e4b15b1f458cedb5859b06b119d32 (diff)
parente783275acabb300f5baffa3bde758036cbb12a7d (diff)
downloadframeworks_native-ab1f72796859235f52c1b9ada0419fe292c4a6a5.zip
frameworks_native-ab1f72796859235f52c1b9ada0419fe292c4a6a5.tar.gz
frameworks_native-ab1f72796859235f52c1b9ada0419fe292c4a6a5.tar.bz2
Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
-rw-r--r--libs/audioflinger/A2dpAudioInterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/audioflinger/A2dpAudioInterface.cpp b/libs/audioflinger/A2dpAudioInterface.cpp
index 747d0e4..995e31c 100644
--- a/libs/audioflinger/A2dpAudioInterface.cpp
+++ b/libs/audioflinger/A2dpAudioInterface.cpp
@@ -302,7 +302,7 @@ ssize_t A2dpAudioInterface::A2dpAudioStreamOut::write(const void* buffer, size_t
Error:
// Simulate audio output timing in case of error
- usleep(bytes * 1000000 / frameSize() / sampleRate());
+ usleep(((bytes * 1000 )/ frameSize() / sampleRate()) * 1000);
return status;
}