Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth support for android 2.2+ added

Browse source
This commit is contained in:
Sylvain Berfini 2013-02-26 16:37:03 +01:00
parent 468a422da8
commit b5d1e09580
2 changed files with 105 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/org/linphone/BluetoothManager.java
View file

@ -2,13 +2,17 @@ package org.linphone;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
import android.bluetooth.BluetoothAdapter; import android.annotation.TargetApi;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.media.AudioManager;
import android.os.Build;
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public class BluetoothManager extends BroadcastReceiver { public class BluetoothManager extends BroadcastReceiver {
@SuppressWarnings("deprecation")
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
boolean routeToBT = context.getResources().getBoolean(R.bool.route_audio_to_bluetooth_if_available); boolean routeToBT = context.getResources().getBoolean(R.bool.route_audio_to_bluetooth_if_available);
if (!routeToBT) if (!routeToBT)
@ -17,22 +21,47 @@ public class BluetoothManager extends BroadcastReceiver {
String action = intent.getAction(); String action = intent.getAction();
LinphoneManager lm = LinphoneManager.getInstance(); LinphoneManager lm = LinphoneManager.getInstance();
String actionScoConnected = AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED;
if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) { if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
Log.e("Bluetooth Received Event" + " ACTION_ACL_DISCONNECTED" ); Log.e("Bluetooth Received Event" + " ACTION_ACL_DISCONNECTED" );
if (lm != null) { if (lm != null) {
lm.uninitBluetooth(); lm.isBluetoothScoConnected = false;
lm.scoDisconnected();
lm.routeAudioToReceiver(); lm.routeAudioToReceiver();
} }
} else if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) { }
else if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
Log.e("Bluetooth Received Event" + " ACTION_ACL_CONNECTED" ); Log.e("Bluetooth Received Event" + " ACTION_ACL_CONNECTED" );
if (lm != null) { if (lm != null) {
lm.routeToBluetoothIfAvailable(); lm.isBluetoothScoConnected = true;
lm.scoConnected();
} }
} else if (BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED.equals(action)) { }
Log.e("Bluetooth state changed!"); else if (actionScoConnected.equals(action)) {
int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, 0);
Log.e("Bluetooth sco state changed : " + state);
if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) {
if (lm != null) { if (lm != null) {
lm.isBluetoothScoConnected = true;
lm.scoConnected();
}
} else if (state == AudioManager.SCO_AUDIO_STATE_DISCONNECTED) {
if (lm != null) {
lm.isBluetoothScoConnected = false;
lm.scoDisconnected();
lm.routeAudioToReceiver();
}
}
}
//Using real value instead of constant because not available before sdk 11
else if ("android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED".equals(action)) { //BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED
int currentConnState = intent.getIntExtra("android.bluetooth.adapter.extra.CONNECTION_STATE", //BluetoothAdapter.EXTRA_CONNECTION_STATE
0); //BluetoothAdapter.STATE_DISCONNECTED
Log.e("Bluetooth state changed: " + currentConnState);
if (lm != null && currentConnState == 2) { //BluetoothAdapter.STATE_CONNECTED
lm.isBluetoothScoConnected = true;
lm.startBluetooth(); lm.startBluetooth();
} }
} }

43
src/org/linphone/LinphoneManager.java
View file

@ -150,6 +150,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
private BluetoothAdapter mBluetoothAdapter; private BluetoothAdapter mBluetoothAdapter;
private BluetoothHeadset mBluetoothHeadset; private BluetoothHeadset mBluetoothHeadset;
private BluetoothProfile.ServiceListener mProfileListener; private BluetoothProfile.ServiceListener mProfileListener;
private BroadcastReceiver bluetoothReiceiver = new BluetoothManager();
public boolean isBluetoothScoConnected;
private static List<LinphoneSimpleListener> simpleListeners = new ArrayList<LinphoneSimpleListener>(); private static List<LinphoneSimpleListener> simpleListeners = new ArrayList<LinphoneSimpleListener>();
public static void addListener(LinphoneSimpleListener listener) { public static void addListener(LinphoneSimpleListener listener) {
@ -204,14 +206,14 @@ public final class LinphoneManager implements LinphoneCoreListener {
boolean routeToBT = mServiceContext.getResources().getBoolean(R.bool.route_audio_to_bluetooth_if_available); boolean routeToBT = mServiceContext.getResources().getBoolean(R.bool.route_audio_to_bluetooth_if_available);
if (!routeToBT || (routeToBT && !routeToBluetoothIfAvailable())) { if (!routeToBT || (routeToBT && !routeToBluetoothIfAvailable())) {
mLc.enableSpeaker(false); mLc.enableSpeaker(false);
uninitBluetooth(); scoDisconnected();
} else { } else {
Log.d("Routing audio to bluetooth headset"); Log.d("Routing audio to bluetooth headset");
routeToBluetoothEnabled = true; routeToBluetoothEnabled = true;
} }
} else { } else {
mLc.enableSpeaker(true); mLc.enableSpeaker(true);
uninitBluetooth(); scoDisconnected();
} }
for (LinphoneOnAudioChangedListener listener : getSimpleListeners(LinphoneOnAudioChangedListener.class)) { for (LinphoneOnAudioChangedListener listener : getSimpleListeners(LinphoneOnAudioChangedListener.class)) {
@ -243,7 +245,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
@TargetApi(Build.VERSION_CODES.HONEYCOMB) @TargetApi(Build.VERSION_CODES.HONEYCOMB)
public void startBluetooth() { public void startBluetooth() {
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30) && mBluetoothAdapter.isEnabled()) { if (mBluetoothAdapter.isEnabled()) {
if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
mProfileListener = new BluetoothProfile.ServiceListener() { mProfileListener = new BluetoothProfile.ServiceListener() {
@TargetApi(Build.VERSION_CODES.HONEYCOMB) @TargetApi(Build.VERSION_CODES.HONEYCOMB)
public void onServiceConnected(int profile, BluetoothProfile proxy) { public void onServiceConnected(int profile, BluetoothProfile proxy) {
@ -264,6 +267,18 @@ public final class LinphoneManager implements LinphoneCoreListener {
}; };
mBluetoothAdapter.getProfileProxy(mServiceContext, mProfileListener, BluetoothProfile.HEADSET); mBluetoothAdapter.getProfileProxy(mServiceContext, mProfileListener, BluetoothProfile.HEADSET);
} else { } else {
@SuppressWarnings("deprecation")
String actionScoConnected = AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED;
Intent currentValue = mServiceContext.registerReceiver(bluetoothReiceiver, new IntentFilter(actionScoConnected));
int state = currentValue == null ? 0 : currentValue.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, 0);
if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) {
isBluetoothScoConnected = true;
scoConnected();
}
}
}
else {
scoDisconnected();
routeAudioToReceiver(); routeAudioToReceiver();
} }
} }
@ -271,10 +286,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
@TargetApi(Build.VERSION_CODES.HONEYCOMB) @TargetApi(Build.VERSION_CODES.HONEYCOMB)
public boolean routeToBluetoothIfAvailable() { public boolean routeToBluetoothIfAvailable() {
BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30) && mBluetoothAdapter.isEnabled() && mAudioManager.isBluetoothScoAvailableOffCall()) { if (mBluetoothAdapter.isEnabled() && mAudioManager.isBluetoothScoAvailableOffCall()) {
mAudioManager.setBluetoothScoOn(true); mAudioManager.setBluetoothScoOn(true);
mAudioManager.startBluetoothSco(); mAudioManager.startBluetoothSco();
if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
boolean connected = false; boolean connected = false;
if (mBluetoothHeadset != null) { if (mBluetoothHeadset != null) {
List<BluetoothDevice> devices = mBluetoothHeadset.getConnectedDevices(); List<BluetoothDevice> devices = mBluetoothHeadset.getConnectedDevices();
@ -285,16 +301,27 @@ public final class LinphoneManager implements LinphoneCoreListener {
if (!connected) { if (!connected) {
Log.d("No bluetooth device available"); Log.d("No bluetooth device available");
uninitBluetooth(); scoDisconnected();
} }
return connected; return connected;
} else {
return isBluetoothScoConnected;
} }
}
return false; return false;
} }
@TargetApi(Build.VERSION_CODES.HONEYCOMB) public void scoConnected() {
public void uninitBluetooth() { Log.e("Bluetooth sco connected!");
if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30) && mAudioManager != null) { mAudioManager.setMode(AudioManager.MODE_IN_CALL);
routeToBluetoothIfAvailable();
}
public void scoDisconnected() {
Log.e("Bluetooth sco disconnected!");
if (mAudioManager != null) {
mAudioManager.setMode(AudioManager.MODE_NORMAL);
mAudioManager.stopBluetoothSco(); mAudioManager.stopBluetoothSco();
mAudioManager.setBluetoothScoOn(false); mAudioManager.setBluetoothScoOn(false);
} }