drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '617e715a40e2867c0b30d1bae38c20815ee30071':
  Fix RemoteController synchronization mode
This commit is contained in:
Eric Laurent
2014-03-06 19:49:55 +00:00
committed by Android Git Automerger
parent 12caef7836 617e715a40
commit eac19754ca
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/RemoteController.java
View File

@ -404,7 +404,7 @@ public final class RemoteController
* @throws IllegalArgumentException * @throws IllegalArgumentException
*/ */
public boolean setSynchronizationMode(int sync) 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); throw new IllegalArgumentException("Unknown synchronization mode " + sync);
} }
if (!mIsRegistered) { if (!mIsRegistered) {