Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903

Browse Source 
am: 0fa22022a3

* commit '0fa22022a378db8de881af397b73d28b0939e5ff':
  Add Bluetooth headset API to allow disabling audio route.
This commit is contained in:
Bryce Lee
2015-11-17 16:21:59 +00:00
committed by android-build-merger
parent dbe1804f58 0fa22022a3
commit e2861471b9
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/java/android/bluetooth/BluetoothHeadset.java
View File

@@ -684,6 +684,48 @@ public final class BluetoothHeadset implements BluetoothProfile {
return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
}
/**
* Sets whether audio routing is allowed. When set to {@code false}, the AG will not route any
* audio to the HF unless explicitly told to.
* This method should be used in cases where the SCO channel is shared between multiple profiles
* and must be delegated by a source knowledgeable
* Note: This is an internal function and shouldn't be exposed
*
* @param allowed {@code true} if the profile can reroute audio, {@code false} otherwise.
*
* @hide
*/
public void setAudioRouteAllowed(boolean allowed) {
if (VDBG) log("setAudioRouteAllowed");
if (mService != null && isEnabled()) {
try {
mService.setAudioRouteAllowed(allowed);
} catch (RemoteException e) {Log.e(TAG, e.toString());}
} else {
Log.w(TAG, "Proxy not attached to service");
if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
}
}
/**
* Returns whether audio routing is allowed. see {@link #setAudioRouteAllowed(boolean)}.
* Note: This is an internal function and shouldn't be exposed
*
* @hide
*/
public boolean getAudioRouteAllowed() {
if (VDBG) log("getAudioRouteAllowed");
if (mService != null && isEnabled()) {
try {
return mService.getAudioRouteAllowed();
} catch (RemoteException e) {Log.e(TAG, e.toString());}
} else {
Log.w(TAG, "Proxy not attached to service");
if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
}
return false;
}
/**
* Check if Bluetooth SCO audio is connected.
*

2
core/java/android/bluetooth/IBluetoothHeadset.aidl
View File

@@ -50,6 +50,8 @@ interface IBluetoothHeadset {
boolean isAudioOn();
boolean connectAudio();
boolean disconnectAudio();
void setAudioRouteAllowed(boolean allowed);
boolean getAudioRouteAllowed();
boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);
boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);
void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);