Final fix for two incall activities issue

AndroidManifest.xml

@@ -76,6 +76,7 @@
 <!--                    android:launchMode="singleTask"-->
             <activity android:name="org.linphone.IncallActivity"
                     android:theme="@android:style/Theme.NoTitleBar"
+                    android:launchMode="singleInstance"
                     android:configChanges="keyboardHidden|orientation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

src/org/linphone/IncallActivity.java

@@ -113,10 +113,12 @@ public class IncallActivity extends AbstractCalleesActivity implements
 	
 	@Override
 	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();
 	}
 

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;
 			}
 		});
 	}