diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-06 20:05:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 20:05:33 +0000 |
| commit | b4545ce96c49fd5e941432dea56bd7b550c123df (patch) | |
| tree | 920964a3b8f1ee5f71b8099adb54fca9778886d4 /media | |
| parent | 529ae9e1277acf8c74c151824bee29eba3a6a691 (diff) | |
| parent | eac19754ca0822e4c1c50c436affbf5cbf7e08d3 (diff) | |
| download | frameworks_base-b4545ce96c49fd5e941432dea56bd7b550c123df.zip frameworks_base-b4545ce96c49fd5e941432dea56bd7b550c123df.tar.gz frameworks_base-b4545ce96c49fd5e941432dea56bd7b550c123df.tar.bz2 | |
am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
Fix RemoteController synchronization mode
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/RemoteController.java | 2 |
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) { |