summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2011-07-19 10:00:58 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-07-19 10:00:58 -0700
commitf1cf82f65d536fb1daae187271345f5b5d68ae44 (patch)
tree52b95328c265e2aa7b6066daa886a0f6da8d5146
parent7dde1c8ccce049378b8aa9e757b6f907040c8640 (diff)
parent06e0333c7eb50533cc6e0f7b61812d2840844296 (diff)
Merge "Return the play stayed locked."
-rw-r--r--media/java/android/media/AudioTrack.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index b20a6e907dfe..4f9eb2bbf2ff 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -551,7 +551,9 @@ public class AudioTrack
* @see #PLAYSTATE_PLAYING
*/
public int getPlayState() {
- return mPlayState;
+ synchronized (mPlayStateLock) {
+ return mPlayState;
+ }
}
/**