From 0b3c2af42029b67e92fa920d5db0ff65ed7ab3d1 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 6 Sep 2016 16:30:27 +0200 Subject: [PATCH] Fix starting of bluetooth manager --- src/org/linphone/LinphoneLauncherActivity.java | 6 ++++++ src/org/linphone/LinphoneManager.java | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java index 0b52e46ec..fc1c3a9c7 100644 --- a/src/org/linphone/LinphoneLauncherActivity.java +++ b/src/org/linphone/LinphoneLauncherActivity.java @@ -21,6 +21,7 @@ package org.linphone; import static android.content.Intent.ACTION_MAIN; import org.linphone.assistant.RemoteProvisioningActivity; +import org.linphone.mediastream.Version; import org.linphone.tutorials.TutorialLauncherActivity; import android.app.Activity; @@ -72,6 +73,11 @@ public class LinphoneLauncherActivity extends Activity { } else { classToStart = LinphoneActivity.class; } + + // We need LinphoneService to start bluetoothManager + if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) { + BluetoothManager.getInstance().initBluetooth(); + } mHandler.postDelayed(new Runnable() { @Override diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 4210c7a0e..76dd19ba5 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -295,6 +295,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag instance = new LinphoneManager(c); instance.startLibLinphone(c); + TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE); boolean gsmIdle = tm.getCallState() == TelephonyManager.CALL_STATE_IDLE; setGsmIdle(gsmIdle); @@ -776,10 +777,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag updateNetworkReachability(); - if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) { - BluetoothManager.getInstance().initBluetooth(); - } - resetCameraFromPreferences(); }