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

Fix crash on devices without bluetooth

Browse source
This commit is contained in:
Sylvain Berfini 2014-07-03 09:05:21 +02:00
parent 082f39a1e6
commit 60d8407c06
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,7 @@ public class BluetoothManager extends BroadcastReceiver {
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
if (mBluetoothAdapter.isEnabled()) { if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) {
if (mProfileListener != null) { if (mProfileListener != null) {
Log.w("Bluetooth headset profile was already opened, let's close it"); Log.w("Bluetooth headset profile was already opened, let's close it");
mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset); mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset);
@ -130,7 +130,7 @@ public class BluetoothManager extends BroadcastReceiver {
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
} }
if (mBluetoothAdapter.isEnabled() && mAudioManager.isBluetoothScoAvailableOffCall()) { if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled() && mAudioManager.isBluetoothScoAvailableOffCall()) {
if (isBluetoothHeadsetAvailable()) { if (isBluetoothHeadsetAvailable()) {
if (mAudioManager != null && !mAudioManager.isBluetoothScoOn()) { if (mAudioManager != null && !mAudioManager.isBluetoothScoOn()) {
Log.d("Bluetooth sco off, let's start it"); Log.d("Bluetooth sco off, let's start it");
@ -183,7 +183,7 @@ public class BluetoothManager extends BroadcastReceiver {
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
} }
if (mBluetoothAdapter.isEnabled() && mAudioManager.isBluetoothScoAvailableOffCall()) { if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled() && mAudioManager.isBluetoothScoAvailableOffCall()) {
boolean isHeadsetConnected = false; boolean isHeadsetConnected = false;
if (mBluetoothHeadset != null) { if (mBluetoothHeadset != null) {
List<BluetoothDevice> devices = mBluetoothHeadset.getConnectedDevices(); List<BluetoothDevice> devices = mBluetoothHeadset.getConnectedDevices();
@ -230,7 +230,7 @@ public class BluetoothManager extends BroadcastReceiver {
disableBluetoothSCO(); disableBluetoothSCO();
if (mProfileListener != null && mBluetoothHeadset != null) { if (mBluetoothAdapter != null && mProfileListener != null && mBluetoothHeadset != null) {
mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset); mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset);
mProfileListener = null; mProfileListener = null;
} }