From 4ce4a2a869bf0b0501cfd478d2a8fb2131a4d7c4 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 27 Jan 2017 11:58:17 +0100
Subject: [PATCH] Remove old code which break AEC software in some cases

---
 src/org/linphone/LinphoneManager.java     |  9 +--------
 src/org/linphone/PreferencesMigrator.java | 11 -----------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 7510025c6..4743db9f4 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -763,6 +763,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	private synchronized void initLiblinphone(LinphoneCore lc) throws LinphoneCoreException {
 		mLc = lc;
 
+
 		PreferencesMigrator prefMigrator = new PreferencesMigrator(mServiceContext);
 		prefMigrator.migrateRemoteProvisioningUriIfNeeded();
 		prefMigrator.migrateSharingServerUrlIfNeeded();
@@ -772,14 +773,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			prefMigrator.doMigration();
 		}
 
-		// Some devices could be using software AEC before
-		// This will disable it in favor of hardware AEC if available
-		if (prefMigrator.isEchoMigratioNeeded()) {
-			Log.d("Echo canceller configuration need to be updated");
-			prefMigrator.doEchoMigration();
-			mPrefs.echoConfigurationUpdated();
-		}
-
 		mLc.setZrtpSecretsCache(basePath + "/zrtp_secrets");
 
 		try {
diff --git a/src/org/linphone/PreferencesMigrator.java b/src/org/linphone/PreferencesMigrator.java
index 88699b881..937b563e1 100644
--- a/src/org/linphone/PreferencesMigrator.java
+++ b/src/org/linphone/PreferencesMigrator.java
@@ -59,17 +59,6 @@ public class PreferencesMigrator {
 		return (!lc.needsEchoCalibration() && mNewPrefs.isEchoCancellationEnabled());
 	}
 
-	public void doEchoMigration() {
-		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-		if (lc == null) {
-			return;
-		}
-
-		if (!lc.needsEchoCalibration()) {
-			mNewPrefs.setEchoCancellation(false);
-		}
-	}
-
 	public boolean isMigrationNeeded() {
 		int accountNumber = mOldPrefs.getInt(getString(R.string.pref_extra_accounts), -1);
 		return accountNumber != -1;