This commit is contained in:
Guillaume Beraudo 2010-12-01 17:03:22 +01:00
parent 1d26f24529
commit a7c66cff38
3 changed files with 3 additions and 9 deletions

View file

@ -24,7 +24,6 @@ import org.linphone.core.AndroidCameraRecordManager;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import android.app.Activity; import android.app.Activity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
@ -120,11 +119,6 @@ public class VideoCallActivity extends Activity {
return false; return false;
} }
protected void startprefActivity() {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.setClass(this, LinphonePreferencesActivity.class);
startActivity(intent);
}
@Override @Override

View file

@ -189,10 +189,10 @@ public class AndroidCameraRecordManager {
return false; return false;
} }
public void invalidateParameters() { public void invalidateParameters() {
if (isRecording()) stopVideoRecording(); stopVideoRecording();
parameters = null; parameters = null;
} }
} }

@ -1 +1 @@
Subproject commit b2e49a28c760f7b010ebf31b312edbac660f9894 Subproject commit a699e2a01aa1a6a487f3c674ee162f6a69cb65af