commit cf1d115f9120111a2bd9b41306fac51588a153d7
author Eric Laurent <elaurent@google.com> Fri Jun 15 12:30:46 2012 -0700
committer Eric Laurent <elaurent@google.com> Fri Jun 15 12:30:46 2012 -0700
tree e5145f6706128b039571d1fa5045b8098e257252
parent 19b0c305ce965eceb375a31d4004cb087a9d0554

Revert "Fix AudioManager.testRouting()."

This reverts commit 64e22d783e2d7ad2dc2b3238c4572f59873d8d05.

tests/tests/media/src/android/media/cts/AudioManagerTest.java

diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index 991f0b9..d52e699 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -130,13 +130,14 @@
 
     @SuppressWarnings("deprecation")
     public void testRouting() throws Exception {
+        // setBluetoothA2dpOn is a no-op, and getRouting should always return -1
+        // AudioManager.MODE_CURRENT
         boolean oldA2DP = mAudioManager.isBluetoothA2dpOn();
-        mAudioManager.setBluetoothA2dpOn(!oldA2DP);
-        assertEquals(!oldA2DP , mAudioManager.isBluetoothA2dpOn());
-        mAudioManager.setBluetoothA2dpOn(oldA2DP);
+        mAudioManager.setBluetoothA2dpOn(true);
+        assertEquals(oldA2DP , mAudioManager.isBluetoothA2dpOn());
+        mAudioManager.setBluetoothA2dpOn(false);
         assertEquals(oldA2DP , mAudioManager.isBluetoothA2dpOn());
 
-        // getRouting should always return -1 (AudioManager.MODE_CURRENT)
         assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_RINGTONE));
         assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_NORMAL));
         assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_CALL));