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

Merged github's pull request #368

Browse source
This commit is contained in:
Sylvain Berfini 2018-10-01 11:09:43 +02:00
parent 50373ebe53
commit 4cb1afc08a
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/android/org/linphone/LinphoneService.java
View file

@ -58,6 +58,7 @@ import org.linphone.core.ProxyConfig;
import org.linphone.core.RegistrationState; import org.linphone.core.RegistrationState;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
import org.linphone.mediastream.Version; import org.linphone.mediastream.Version;
import org.linphone.receivers.BluetoothManager;
import org.linphone.receivers.KeepAliveReceiver; import org.linphone.receivers.KeepAliveReceiver;
import org.linphone.ui.LinphoneOverlay; import org.linphone.ui.LinphoneOverlay;
@ -434,6 +435,8 @@ public final class LinphoneService extends Service {
Compatibility.scheduleAlarm(alarmManager, AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 600000, keepAlivePendingIntent); Compatibility.scheduleAlarm(alarmManager, AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 600000, keepAlivePendingIntent);
} }
BluetoothManager.getInstance().initBluetooth();
return START_REDELIVER_INTENT; return START_REDELIVER_INTENT;
} }

7
src/android/org/linphone/activities/LinphoneLauncherActivity.java
View file

@ -35,8 +35,6 @@ import org.linphone.R;
import org.linphone.assistant.RemoteProvisioningActivity; import org.linphone.assistant.RemoteProvisioningActivity;
import org.linphone.call.CallActivity; import org.linphone.call.CallActivity;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
import org.linphone.mediastream.Version;
import org.linphone.receivers.BluetoothManager;
import static android.content.Intent.ACTION_MAIN; import static android.content.Intent.ACTION_MAIN;
@ -117,11 +115,6 @@ public class LinphoneLauncherActivity extends Activity {
classToStart = LinphoneActivity.class; classToStart = LinphoneActivity.class;
} }
// We need LinphoneService to start bluetoothManager
if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
BluetoothManager.getInstance().initBluetooth();
}
mHandler.postDelayed(new Runnable() { mHandler.postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {