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

am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken

Browse Source
This commit is contained in:
Jaikumar Ganesh
2010-06-07 14:11:24 -07:00
committed by Android Git Automerger
parent eee1376c43 a8c2514edd
commit 8984d144f1
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,11 +189,11 @@ public final class BluetoothHeadset {
* @return One of the STATE_ return codes, or STATE_ERROR if this proxy
* object is currently not connected to the Headset service.
*/
public int getState() {
public int getState(BluetoothDevice device) {
if (DBG) log("getState()");
if (mService != null) {
try {
return mService.getState();
return mService.getState(device);
} catch (RemoteException e) {Log.e(TAG, e.toString());}
} else {
Log.w(TAG, "Proxy not attached to service");
@@ -271,11 +271,11 @@ public final class BluetoothHeadset {
* be made asynchornous. Returns false if this proxy object is
* not currently connected to the Headset service.
*/
public boolean disconnectHeadset() {
public boolean disconnectHeadset(BluetoothDevice device) {
if (DBG) log("disconnectHeadset()");
if (mService != null) {
try {
mService.disconnectHeadset();
mService.disconnectHeadset(device);
return true;
} catch (RemoteException e) {Log.e(TAG, e.toString());}
} else {

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

@@ -24,10 +24,10 @@ import android.bluetooth.BluetoothDevice;
* {@hide}
*/
interface IBluetoothHeadset {
int getState();
int getState(in BluetoothDevice device);
BluetoothDevice getCurrentHeadset();
boolean connectHeadset(in BluetoothDevice device);
void disconnectHeadset();
void disconnectHeadset(in BluetoothDevice device);
boolean isConnected(in BluetoothDevice device);
boolean startVoiceRecognition();
boolean stopVoiceRecognition();

2
core/java/android/server/BluetoothService.java
View File

@@ -1858,7 +1858,7 @@ public class BluetoothService extends IBluetooth.Stub {
// Rather not do this from here, but no-where else and I need this
// dump
pw.println("\n--Headset Service--");
switch (headset.getState()) {
switch (headset.getState(headset.getCurrentHeadset())) {
case BluetoothHeadset.STATE_DISCONNECTED:
pw.println("getState() = STATE_DISCONNECTED");
break;

18
media/java/android/media/AudioService.java
View File

@@ -1092,16 +1092,20 @@ public class AudioService extends IAudioService.Stub {
private BluetoothHeadset.ServiceListener mBluetoothHeadsetServiceListener =
new BluetoothHeadset.ServiceListener() {
public void onServiceConnected() {
if (mBluetoothHeadset != null &&
mBluetoothHeadset.getState() == BluetoothHeadset.STATE_CONNECTED) {
mBluetoothHeadsetConnected = true;
if (mBluetoothHeadset != null) {
BluetoothDevice device = mBluetoothHeadset.getCurrentHeadset();
if (mBluetoothHeadset.getState(device) == BluetoothHeadset.STATE_CONNECTED) {
mBluetoothHeadsetConnected = true;
}
}
}
public void onServiceDisconnected() {
if (mBluetoothHeadset != null &&
mBluetoothHeadset.getState() == BluetoothHeadset.STATE_DISCONNECTED) {
mBluetoothHeadsetConnected = false;
clearAllScoClients();
if (mBluetoothHeadset != null) {
BluetoothDevice device = mBluetoothHeadset.getCurrentHeadset();
if (mBluetoothHeadset.getState(device) == BluetoothHeadset.STATE_DISCONNECTED) {
mBluetoothHeadsetConnected = false;
clearAllScoClients();
}
}
}
};

2
wifi/java/android/net/wifi/WifiStateTracker.java
View File

@@ -2324,7 +2324,7 @@ public class WifiStateTracker extends NetworkStateTracker {
* @return Whether to disable coexistence mode.
*/
private boolean shouldDisableCoexistenceMode() {
int state = mBluetoothHeadset.getState();
int state = mBluetoothHeadset.getState(mBluetoothHeadset.getCurrentHeadset());
return state == BluetoothHeadset.STATE_DISCONNECTED;
}
}