mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-05-01 20:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into bellesip

Browse source 
Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-12 13:18:18 +01:00
commit 725b516ddf
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,8 @@ public class RemoteProvisioning {
if(x2l.convert(lp) != 0) { if(x2l.convert(lp) != 0) {
Log.e("Can't convert remote provisioning file to LinphoneConfig"); Log.e("Can't convert remote provisioning file to LinphoneConfig");
return; return;
} else {
lp.sync();
} }
Log.i("Remote provisioning ok"); Log.i("Remote provisioning ok");
} catch (MalformedURLException e) { } catch (MalformedURLException e) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 922851412eddf866d48ebcd9ad7231be39e5231f Subproject commit 75e340883704bd3aa55477567c37aade1e7bba3d