diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6e88ac139..845442572 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -76,6 +76,7 @@ diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java index 04c40e0fd..32a2544fa 100644 --- a/src/org/linphone/IncallActivity.java +++ b/src/org/linphone/IncallActivity.java @@ -112,11 +112,13 @@ public class IncallActivity extends AbstractCalleesActivity implements private boolean mAllowTransfers; @Override - protected void onCreate(Bundle savedInstanceState) { + protected void onCreate(Bundle savedInstanceState) { + setActive(true); + if (finishIfAutoRestartAfterACrash(savedInstanceState)) { + setActive(false); return; } - setActive(true); if (!Version.isXLargeScreen(this)) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); @@ -153,6 +155,7 @@ public class IncallActivity extends AbstractCalleesActivity implements @Override protected void onPause() { setActive(false); + instance = null; super.onPause(); } diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 391b24e0f..476a498ce 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -425,7 +425,6 @@ public class LinphoneActivity extends TabActivity implements ContactPicked if (IncallActivity.active) return; Intent intent = new Intent().setClass(LinphoneActivity.this, IncallActivity.class); startActivityForResult(intent, incall_activity); - IncallActivity.active = true; } }); }