summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-01-02 15:08:26 -0800
committerEric Laurent <elaurent@google.com>2014-03-06 09:22:26 -0800
commit4b0f1554577e1782e93998af5d83ebf5add3543e (patch)
tree5dfdcaf318b64663f2ce51d21fd308a276942fbd /media
parent77a60f006f8b7260207043529d3ed004db301bd5 (diff)
downloadframeworks_base-4b0f1554577e1782e93998af5d83ebf5add3543e.zip
frameworks_base-4b0f1554577e1782e93998af5d83ebf5add3543e.tar.gz
frameworks_base-4b0f1554577e1782e93998af5d83ebf5add3543e.tar.bz2
Fix RemoteController synchronization mode
Fix erroneous argument check in RemoteController syncrhonization mode setter.. Bug 12189375 Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/RemoteController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java
index 6dbb3cd..910b24c 100644
--- a/media/java/android/media/RemoteController.java
+++ b/media/java/android/media/RemoteController.java
@@ -404,7 +404,7 @@ public final class RemoteController
* @throws IllegalArgumentException
*/
public boolean setSynchronizationMode(int sync) throws IllegalArgumentException {
- if ((sync != POSITION_SYNCHRONIZATION_NONE) || (sync != POSITION_SYNCHRONIZATION_CHECK)) {
+ if ((sync != POSITION_SYNCHRONIZATION_NONE) && (sync != POSITION_SYNCHRONIZATION_CHECK)) {
throw new IllegalArgumentException("Unknown synchronization mode " + sync);
}
if (!mIsRegistered) {