am 89499268: Merge "Revert "Fix AudioManager.testRouting()."" into jb-dev
* commit '89499268e942d2450d77909af9979552a5099241':
Revert "Fix AudioManager.testRouting()."
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));