drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AudioManager: back to old setBluetoothA2dpOn()

Browse Source 
Come back to old versions of setBluetoothA2dpOn() and isBluetoothA2dpOn().

MediaRouter will call methods on IAudioService directly.

Change-Id: I18f0a3106bad78715ed11a6b7b4ec1d656cdae41
This commit is contained in:
Eric Laurent
2012-06-15 11:48:50 -07:00
parent 8b9c6d51d5
commit 242b33870b
1 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
media/java/android/media/AudioManager.java
View File

@ -1271,42 +1271,25 @@ public class AudioManager {
}
/**
* Allow or disallow use of Bluetooth A2DP for media.
* <p>The default behavior of the system is to use A2DP for media playback whenever an A2DP sink
* is connected. Applications can use this method to override this behavior.
* Note that the request will not persist after a wired headset or an A2DP sink is connected or
* disconnected:
* - Connection of an A2DP sink automatically enables use of A2DP.
* - Connection of a wired headset automatically disables use of A2DP.
* - Disconnection of a wired headset automatically enables use of A2DP if an A2DP sink is
* connected.
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.
* @param on set <var>true</var> to allow use of A2DP for media (default).
* <var>false</var> to disallow use of A2DP for media.
* @param on set <var>true</var> to route A2DP audio to/from Bluetooth
* headset; <var>false</var> disable A2DP audio
* @deprecated Do not use.
*/
@Deprecated public void setBluetoothA2dpOn(boolean on){
IAudioService service = getService();
try {
service.setBluetoothA2dpOn(on);
} catch (RemoteException e) {
Log.e(TAG, "Dead object in setBluetoothA2dpOn", e);
}
}
/**
* Checks whether use of A2DP sinks is enabled for media.
* Checks whether A2DP audio routing to the Bluetooth headset is on or off.
*
* @return true if use of A2DP is enabled for media, false otherwise.
* @return true if A2DP audio is being routed to/from Bluetooth headset;
* false if otherwise
*/
public boolean isBluetoothA2dpOn() {
IAudioService service = getService();
try {
return service.isBluetoothA2dpOn();
} catch (RemoteException e) {
Log.e(TAG, "Dead object in isBluetoothA2dpOn", e);
if (AudioSystem.getDeviceConnectionState(DEVICE_OUT_BLUETOOTH_A2DP,"")
== AudioSystem.DEVICE_STATE_UNAVAILABLE) {
return false;
} else {
return true;
}
}