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

remove dead and dangerous code.

Browse source 
Indeed, if linphone was started when a gsm call is active, max_calls was irrecoverably set to 0, which caused no calls to be sent or received.
This commit is contained in:
Simon Morlat 2018-01-07 17:53:15 +01:00
parent 2096f2730d
commit 3c53044a44
1 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/android/org/linphone/LinphoneManager.java
View file

@ -361,9 +361,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
// H264 codec Management - set to auto mode -> MediaCodec >= android 5.0 >= OpenH264 // H264 codec Management - set to auto mode -> MediaCodec >= android 5.0 >= OpenH264
H264Helper.setH264Mode(H264Helper.MODE_AUTO, getLc()); H264Helper.setH264Mode(H264Helper.MODE_AUTO, getLc());
TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
boolean gsmIdle = tm.getCallState() == TelephonyManager.CALL_STATE_IDLE;
setGsmIdle(gsmIdle);
return instance; return instance;
} }
@ -1325,33 +1322,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} }
} }
private int savedMaxCallWhileGsmIncall;
private synchronized void preventSIPCalls() {
if (savedMaxCallWhileGsmIncall != 0) {
Log.w("SIP calls are already blocked due to GSM call running");
return;
}
savedMaxCallWhileGsmIncall = mLc.getMaxCalls();
mLc.setMaxCalls(0);
}
private synchronized void allowSIPCalls() {
if (savedMaxCallWhileGsmIncall == 0) {
Log.w("SIP calls are already allowed as no GSM call known to be running");
return;
}
mLc.setMaxCalls(savedMaxCallWhileGsmIncall);
savedMaxCallWhileGsmIncall = 0;
}
public static void setGsmIdle(boolean gsmIdle) {
LinphoneManager mThis = instance;
if (mThis == null) return;
if (gsmIdle) {
mThis.allowSIPCalls();
} else {
mThis.preventSIPCalls();
}
}
public Context getContext() { public Context getContext() {
try { try {
if (LinphoneActivity.isInstanciated()) if (LinphoneActivity.isInstanciated())