summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-04-10 23:14:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-10 23:14:07 +0000
commitb2fb69f42b5502ffbaad12f9fb84ea72e764272e (patch)
tree6525356a491d243e3f9596c0a7fbcd39d6113671
parent262ef08ebabf01a6904081dea39bc07852816e98 (diff)
parentcf3f3c27364cf82619e50436f3f9d308dc669229 (diff)
downloadframeworks_base-b2fb69f42b5502ffbaad12f9fb84ea72e764272e.zip
frameworks_base-b2fb69f42b5502ffbaad12f9fb84ea72e764272e.tar.gz
frameworks_base-b2fb69f42b5502ffbaad12f9fb84ea72e764272e.tar.bz2
am cf3f3c27: Merge "MediaFocusControl: fix comment"
* commit 'cf3f3c27364cf82619e50436f3f9d308dc669229': MediaFocusControl: fix comment
-rw-r--r--media/java/android/media/MediaFocusControl.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/java/android/media/MediaFocusControl.java b/media/java/android/media/MediaFocusControl.java
index 664c707..214306c 100644
--- a/media/java/android/media/MediaFocusControl.java
+++ b/media/java/android/media/MediaFocusControl.java
@@ -1064,10 +1064,8 @@ public class MediaFocusControl implements OnFinished {
private boolean mHasRemotePlayback;
/**
- * The stack of remote control event receivers.
- * Code sections and methods that modify the remote control event receiver stack are
- * synchronized on mPRStack, but also BEFORE on mFocusLock as any change in either
- * stack, audio focus or RC, can lead to a change in the remote control display
+ * The stack of remote control event receivers.
+ * All read and write operations on mPRStack are synchronized.
*/
private final Stack<PlayerRecord> mPRStack = new Stack<PlayerRecord>();