From de68bfca93028f38fc4d743d523f33d886e7e833 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 20 Jan 2017 14:18:22 +0100
Subject: [PATCH] [Switch submodule branch] [Outgrade submodule]

---
 src/org/linphone/LinphoneManager.java             | 2 +-
 src/org/linphone/SettingsFragment.java            | 4 ++--
 src/org/linphone/StatusFragment.java              | 2 +-
 src/org/linphone/assistant/AssistantActivity.java | 2 +-
 submodules/bctoolbox                              | 2 +-
 submodules/belcard                                | 2 +-
 submodules/belle-sip                              | 2 +-
 submodules/linphone                               | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 7510025c6..ebe85a4ec 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -227,7 +227,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	public void initOpenH264DownloadHelper() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
 			Log.i("Android >= 5.1 we disable the download of OpenH264");
-			getLc().enableDownloadOpenH264(false);
+			getLc().enableOpenH264(false);
 			return;
 		}
 
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 5ef7abf75..2e217eff7 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -691,7 +691,7 @@ public class SettingsFragment extends PreferencesListFragment {
 					}
 				}
 			}
-			if (lc.downloadOpenH264Enabled()) {
+			if (lc.openH264Enabled()) {
 				if (pt.getMime().equals("H264") && mCodecDownloader.isCodecFound()) {
 					codec.setSummary(mCodecDownloader.getLicenseMessage());
 					codec.setTitle("OpenH264");
@@ -704,7 +704,7 @@ public class SettingsFragment extends PreferencesListFragment {
 				public boolean onPreferenceChange(Preference preference, Object newValue) {
 					boolean enable = (Boolean) newValue;
 					try {
-						if (lc.downloadOpenH264Enabled()) {
+						if (lc.openH264Enabled()) {
 							if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86")
 									&& pt.getMime().equals("H264") && !mCodecDownloader.isCodecFound()) {
 								mCodecDownloader.setOpenH264HelperListener(LinphoneManager.getInstance().getOpenH264HelperListener());
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index b9e8e19e0..989613907 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -457,7 +457,7 @@ public class StatusFragment extends Fragment {
 			title.setVisibility(TextView.VISIBLE);
 			if (media != null) {
 				String mime = media.getMime();
-				if (LinphoneManager.getLc().downloadOpenH264Enabled() &&
+				if (LinphoneManager.getLc().openH264Enabled() &&
 						media.getMime().equals("H264") &&
 						LinphoneManager.getInstance().getOpenH264DownloadHelper().isCodecFound()) {
 					mime = "OpenH264";
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 95f21e3d3..16195e87b 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -440,7 +440,7 @@ private static AssistantActivity instance;
 	}
 
 	private void launchDownloadCodec() {
-		if (LinphoneManager.getLc().downloadOpenH264Enabled()) {
+		if (LinphoneManager.getLc().openH264Enabled()) {
 			OpenH264DownloadHelper downloadHelper = LinphoneCoreFactory.instance().createOpenH264DownloadHelper();
 			if (Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") && !downloadHelper.isCodecFound()) {
 				CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 7254fe94e..058967d34 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 7254fe94e7155f0164fca177f8bf54ab82b76e84
+Subproject commit 058967d340a97d7a4c155490398162b24c2ea399
diff --git a/submodules/belcard b/submodules/belcard
index ebd037585..eaeab2d66 160000
--- a/submodules/belcard
+++ b/submodules/belcard
@@ -1 +1 @@
-Subproject commit ebd037585965ce80f01be5290abc7e5455009eb8
+Subproject commit eaeab2d665423e1fdbf2f59c2ae8da6c3c89c8fa
diff --git a/submodules/belle-sip b/submodules/belle-sip
index b1695fb52..8d49d1853 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit b1695fb52ede996ed0b50167aab787d1373f49e4
+Subproject commit 8d49d18532e1addebd21b61fc6a13920057bcd5b
diff --git a/submodules/linphone b/submodules/linphone
index 2b407fabf..942f20346 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2b407fabfae4db9029190444b3c59ffee39b1efd
+Subproject commit 942f2034630b0ea50a1394f5c79d676114435e2e