diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-06 21:30:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 21:30:49 +0000 |
| commit | 6c506aacb2015fd23487a4aa48cbb276ad40cc3a (patch) | |
| tree | 38ecdb1302f75b9a42384f4a28c640cee56435f1 /media | |
| parent | 01579953331b415c2ad1f04f91815d1f6eabe1e2 (diff) | |
| parent | 3260f254459fab42fb23389088da0eb73e0e0969 (diff) | |
| download | frameworks_base-6c506aacb2015fd23487a4aa48cbb276ad40cc3a.zip frameworks_base-6c506aacb2015fd23487a4aa48cbb276ad40cc3a.tar.gz frameworks_base-6c506aacb2015fd23487a4aa48cbb276ad40cc3a.tar.bz2 | |
am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '3260f254459fab42fb23389088da0eb73e0e0969':
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) { |