commit 617e715a40e2867c0b30d1bae38c20815ee30071
author Eric Laurent <elaurent@google.com> Thu Mar 06 19:21:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 06 19:21:26 2014 +0000
tree 0f4d44446ae414d3237906cf18059f8413a1f25e
parent 71ab245a0d7830791cb89ec9130313620a1ee029
parent 4b0f1554577e1782e93998af5d83ebf5add3543e

Merge "Fix RemoteController synchronization mode" into klp-dev

media/java/android/media/RemoteController.java

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 @@
      * @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) {