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

Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev

Browse Source 
am: 4636770f0d

* commit '4636770f0df6e91cd7fbdf01b958fbdda688db7a':
  Add ability to set whether audio route is allowed in BluetoothHeadsetClient
This commit is contained in:
Bryce Lee
2015-10-29 07:16:07 +00:00
committed by android-build-merger
parent 2adf45bee0 4636770f0d
commit 3b6f9f78cf
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/bluetooth/BluetoothHeadsetClient.java
View File

@@ -1058,6 +1058,41 @@ public final class BluetoothHeadsetClient implements BluetoothProfile {
return BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED;
}
/**
* Sets whether audio routing is allowed.
*
* Note: This is an internal function and shouldn't be exposed
*/
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.
*
* Note: This is an internal function and shouldn't be exposed
*/
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;
}
/**
* Initiates a connection of audio channel.
*

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

@@ -62,6 +62,8 @@ interface IBluetoothHeadsetClient {
int getAudioState(in BluetoothDevice device);
boolean connectAudio();
boolean disconnectAudio();
void setAudioRouteAllowed(boolean allowed);
boolean getAudioRouteAllowed();
Bundle getCurrentAgFeatures(in BluetoothDevice device);
}