summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2015-03-23 18:55:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-23 18:55:49 +0000
commit4408d8ab70d3385ac043d0f9a210a971c3a570c2 (patch)
treeabe90256407c6c21e2a27c15288ec04fa721e25c /media/libmedia/AudioTrack.cpp
parentd1e85c354bf08cbf7fb7619f91bda1c416b40627 (diff)
parent7ccdaad38054474b1d84b7c37ceffd98e9df354d (diff)
downloadframeworks_av-4408d8ab70d3385ac043d0f9a210a971c3a570c2.zip
frameworks_av-4408d8ab70d3385ac043d0f9a210a971c3a570c2.tar.gz
frameworks_av-4408d8ab70d3385ac043d0f9a210a971c3a570c2.tar.bz2
Merge "Fix position when restoring streaming audio track"
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 247c13a..77ca7ea 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1862,7 +1862,7 @@ status_t AudioTrack::restoreTrack_l(const char *from)
// For streaming tracks, this is the amount we obtained from the user/client
// (not the number actually consumed at the server - those are already lost).
(void) updateAndGetPosition_l();
- if (mStaticProxy != 0) {
+ if (mStaticProxy == 0) {
mPosition = mReleased;
}