From 4b0f1554577e1782e93998af5d83ebf5add3543e Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 2 Jan 2014 15:08:26 -0800 Subject: Fix RemoteController synchronization mode Fix erroneous argument check in RemoteController syncrhonization mode setter.. Bug 12189375 Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10 --- media/java/android/media/RemoteController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media') 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) { -- cgit v1.1