commit 64e22d783e2d7ad2dc2b3238c4572f59873d8d05
author Eric Laurent <elaurent@google.com> Mon Jun 04 08:54:09 2012 -0700
committer Eric Laurent <elaurent@google.com> Mon Jun 04 09:38:18 2012 -0700
tree 33702263df02d95f14bbccd87a19c09094dccea4
parent 6b9fb8c3a69ef283d4e37acd106362e876668cab

Fix AudioManager.testRouting().

AudioManager.setBluetoothA2dpOn() is still deprecated but
AudioManager.isBluetoothA2dpOn() now returns the last value set.

Bug 6572651.

Change-Id: If4947a53e184f126c2010d98af4d312192057638

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 d52e699..991f0b9 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -130,14 +130,13 @@
 
     @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(true);
-        assertEquals(oldA2DP , mAudioManager.isBluetoothA2dpOn());
-        mAudioManager.setBluetoothA2dpOn(false);
+        mAudioManager.setBluetoothA2dpOn(!oldA2DP);
+        assertEquals(!oldA2DP , mAudioManager.isBluetoothA2dpOn());
+        mAudioManager.setBluetoothA2dpOn(oldA2DP);
         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));