summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-23 14:51:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-23 14:51:30 +0000
commit004f2b783576eed9b1ab5886fcf93b3b164d01e0 (patch)
tree0e04f0def66150eabd9db5223c745b6547667ecc /media/java
parent9ad3afe52e9c85e958a3b3e1bce4477f15379151 (diff)
parent79e49a0752bc2ec1431728ab793601536fac1ee5 (diff)
downloadframeworks_base-004f2b783576eed9b1ab5886fcf93b3b164d01e0.zip
frameworks_base-004f2b783576eed9b1ab5886fcf93b3b164d01e0.tar.gz
frameworks_base-004f2b783576eed9b1ab5886fcf93b3b164d01e0.tar.bz2
Merge "Return the record state locked"
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/AudioRecord.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index 5383d08..6da0e25 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -421,7 +421,9 @@ public class AudioRecord
* @see AudioRecord#RECORDSTATE_RECORDING
*/
public int getRecordingState() {
- return mRecordingState;
+ synchronized (mRecordingStateLock) {
+ return mRecordingState;
+ }
}
/**