From 19f10ecc0d77f1d60a6c6e2924be2bc42c9a472b Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <ricardo@cyngn.com>
Date: Thu, 4 Feb 2016 12:23:43 +0000
Subject: [PATCH] TeleService: Enable the AEC toggle

It looks like the scenarios in which the dual-mic echo cancellation
setup is problematic are confined. Surface a toggle for those users,
and leave it on by default for everyone else.

This reverts change I7af67e51c77d75d3803937ec2f5e783bee0bb518

Addresses CRACKLING-665, CRACKLING-617

Change-Id: Icd86af799355bc33c963932667d9b09806f8879a
---
 .../services/Telephony/res/values/config.xml  | 28 +++++++++++++++++++
 system.prop                                   |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 overlay/packages/services/Telephony/res/values/config.xml

diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
new file mode 100644
index 0000000..cb3aa76
--- /dev/null
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- For this option to exist and work, the parameter name must be defined -->
+    <string name="incall_echo_cancellation_parameter">fluence</string>
+
+    <!-- Paired with the above parameter, the below values will be used as enable/disable values for audiomanager.
+         "incall_echo_cancellation_parameter=incall_echo_cancellation_value" will be sent directly down into the
+         HAL. Size of this array must be exactly 2. -->
+    <string-array name="incall_echo_cancellation_values">
+        <item>dualmic</item>
+        <item>none</item>
+    </string-array>
+</resources>
diff --git a/system.prop b/system.prop
index 86414b5..1ce8f60 100644
--- a/system.prop
+++ b/system.prop
@@ -1,5 +1,5 @@
 # Audio
-ro.qc.sdk.audio.fluencetype=none
+ro.qc.sdk.audio.fluencetype=fluence
 persist.audio.fluence.voicecall=true
 persist.audio.fluence.voicerec=false
 persist.audio.fluence.speaker=false