diff options
| author | 2014-03-06 22:09:27 +0000 | |
|---|---|---|
| committer | 2014-03-06 22:09:27 +0000 | |
| commit | 33ac1218b93cb4fcaba398fd73f27dcc72dfede3 (patch) | |
| tree | 1c6429b8c7d00ffabc21cd05468343358bcb6b4f | |
| parent | ece7042d7dc0e449fbcdb7698b31dee114042290 (diff) | |
| parent | 6c506aacb2015fd23487a4aa48cbb276ad40cc3a (diff) | |
am 6c506aac: am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '6c506aacb2015fd23487a4aa48cbb276ad40cc3a':
Fix RemoteController synchronization mode
| -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 6dbb3cd1da61..910b24c20637 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) { |