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

update linphone for ms2 bugfix for phones having more than 2 cameras

Browse source
This commit is contained in:
Simon Morlat 2012-05-23 11:53:10 +02:00
parent 57e0fdc4fe
commit 1b1409c18f
4 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/AboutActivity.java
View file

@ -169,5 +169,5 @@ public class AboutActivity extends Activity implements OnClickListener {
} }
} }
} }
} }

1
src/org/linphone/LinphoneManager.java
View file

@ -554,7 +554,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
private void initFromConfTunnel(){ private void initFromConfTunnel(){
if (!mLc.isTunnelAvailable()) return; if (!mLc.isTunnelAvailable()) return;
NetworkInfo info = mConnectivityManager.getActiveNetworkInfo(); NetworkInfo info = mConnectivityManager.getActiveNetworkInfo();
mLc.tunnelEnableLogs(getPrefBoolean(R.string.pref_debug_key, false));
mLc.tunnelCleanServers(); mLc.tunnelCleanServers();
String host = getString(R.string.tunnel_host); String host = getString(R.string.tunnel_host);
if (host == null || host.length() == 0) if (host == null || host.length() == 0)

6
src/org/linphone/core/LinphoneCoreImpl.java
View file

@ -664,12 +664,6 @@ class LinphoneCoreImpl implements LinphoneCore {
tunnelEnable(nativePtr, enable); tunnelEnable(nativePtr, enable);
} }
private native void tunnelEnableLogs(long nativePtr, boolean enable);
@Override
public synchronized void tunnelEnableLogs(boolean enable) {
tunnelEnableLogs(nativePtr, enable);
}
@Override @Override
public native boolean isTunnelAvailable(); public native boolean isTunnelAvailable();

2
submodules/linphone

@ -1 +1 @@
Subproject commit 65aa07c75fed19afc2467b76982bda4398e7d4f0 Subproject commit c6a6de60dbab77fbf6246551f36858df63daade6