diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-01-06 22:46:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-06 22:46:43 +0000 |
| commit | a144b121b24e6ecbbc4016d15e1d57594c23781e (patch) | |
| tree | 7d6cdae09154a3c6c985fd30a5e568d23ad46fa3 /media | |
| parent | c2ee7bb1462fbf21e7d2d9a45df8a59ee734e1db (diff) | |
| parent | b3ae913115c7d7ac519dc12f212f72dfce89cd8a (diff) | |
| download | frameworks_base-a144b121b24e6ecbbc4016d15e1d57594c23781e.zip frameworks_base-a144b121b24e6ecbbc4016d15e1d57594c23781e.tar.gz frameworks_base-a144b121b24e6ecbbc4016d15e1d57594c23781e.tar.bz2 | |
Merge "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 cdeb4fe..cd3ce1f 100644 --- a/media/java/android/media/RemoteController.java +++ b/media/java/android/media/RemoteController.java @@ -401,7 +401,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) { |