diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 825215eff..34463bb62 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -566,7 +566,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag } } - public synchronized final void destroyLinphoneCore(Context c) { + public synchronized final void destroyLinphoneCore() { sExited = true; BluetoothManager.getInstance().destroy(); try { @@ -582,10 +582,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag } } - public void restartLinphoneCore(Context context){ - destroyLinphoneCore(context); - startLibLinphone(context); - sExited = true; + public void restartLinphoneCore(){ + destroyLinphoneCore(); + startLibLinphone(mServiceContext); } private synchronized void startLibLinphone(Context c) { diff --git a/src/org/linphone/assistant/RemoteProvisioningActivity.java b/src/org/linphone/assistant/RemoteProvisioningActivity.java index 70f3b3b08..164115a57 100644 --- a/src/org/linphone/assistant/RemoteProvisioningActivity.java +++ b/src/org/linphone/assistant/RemoteProvisioningActivity.java @@ -183,11 +183,7 @@ public class RemoteProvisioningActivity extends Activity { mHandler.postDelayed(new Runnable() { @Override public void run() { - LinphoneManager.destroy(); - stopService(new Intent(ACTION_MAIN).setClass(RemoteProvisioningActivity.this, LinphoneService.class)); - Intent intent = new Intent(); - intent.setClass(RemoteProvisioningActivity.this, LinphoneLauncherActivity.class); - startActivity(intent); + LinphoneManager.getInstance().restartLinphoneCore(); } }, 1000); } diff --git a/submodules/linphone b/submodules/linphone index 9f2f6163d..f06140d07 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9f2f6163d0cdf8125af94c3719a8f49647d533b1 +Subproject commit f06140d0758a409a70070aa2bd6f31086613cf1d