am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev

* commit '3260f254459fab42fb23389088da0eb73e0e0969':
  Fix RemoteController synchronization mode
This commit is contained in:
Eric Laurent
2014-03-06 21:30:49 +00:00
committed by Android Git Automerger

View File

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