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

Try to prevent BT crash that happen for some people

Browse source
This commit is contained in:
Sylvain Berfini 2014-10-29 14:54:39 +01:00
parent 8c0d2fc51d
commit c208d3e377
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -147,7 +147,7 @@
<intent-filter><action android:name="android.net.conn.CONNECTIVITY_CHANGE"></action></intent-filter> <intent-filter><action android:name="android.net.conn.CONNECTIVITY_CHANGE"></action></intent-filter>
</receiver> </receiver>
<receiver android:name="org.linphone.BluetoothManager"> <receiver android:name="org.linphone.BluetoothManager" android:enabled="false">
</receiver> </receiver>
<receiver android:name="org.linphone.BootReceiver"> <receiver android:name="org.linphone.BootReceiver">

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

@ -66,14 +66,26 @@ public class BluetoothManager extends BroadcastReceiver {
return instance; return instance;
} }
public BluetoothManager() { private BluetoothManager() {
isBluetoothConnected = false; isBluetoothConnected = false;
mContext = LinphoneService.instance().getApplicationContext(); if (LinphoneService.isReady()) {
mAudioManager = ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE)); mContext = LinphoneService.instance().getApplicationContext();
mAudioManager = ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE));
} else {
Log.w("BluetoothManager tried to init but LinphoneService not ready yet...");
}
instance = this; instance = this;
} }
public void initBluetooth() { public void initBluetooth() {
if (mContext == null && LinphoneService.isReady()) {
mContext = LinphoneService.instance().getApplicationContext();
mAudioManager = ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE));
} else if (mContext == null) {
Log.w("BluetoothManager tried to init bluetooth but LinphoneService not ready yet...");
return;
}
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addCategory(BluetoothHeadset.VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY + "." + BluetoothAssignedNumbers.PLANTRONICS); filter.addCategory(BluetoothHeadset.VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY + "." + BluetoothAssignedNumbers.PLANTRONICS);
filter.addAction(Compatibility.getAudioManagerEventForBluetoothConnectionStateChangedEvent()); filter.addAction(Compatibility.getAudioManagerEventForBluetoothConnectionStateChangedEvent());