Add an option to disable built-in AEC to AppRTC Android Demo

webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java

Index: webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
index 06a2d0680298e6356ee61d96f7fff0c71446094f..bb959ed67a4cb54d58ae272958ababdf0eb6bbea 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
@@ -16,6 +16,8 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.Preference;
 
+import org.webrtc.voiceengine.WebRtcAudioUtils;
+
 /**
  * Settings activity for AppRTC.
  */
@@ -38,6 +40,7 @@ public class SettingsActivity extends Activity
   private String keyprefNoAudioProcessing;
   private String keyprefAecDump;
   private String keyprefOpenSLES;
+  private String keyprefDisableBuiltInAEC;
 
   private String keyPrefRoomServerUrl;
   private String keyPrefDisplayHud;
@@ -62,6 +65,7 @@ public class SettingsActivity extends Activity
     keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
     keyprefAecDump = getString(R.string.pref_aecdump_key);
     keyprefOpenSLES = getString(R.string.pref_opensles_key);
+    keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key);
 
     keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
     keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
@@ -99,10 +103,23 @@ public class SettingsActivity extends Activity
     updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
     updateSummaryB(sharedPreferences, keyprefAecDump);
     updateSummaryB(sharedPreferences, keyprefOpenSLES);
+    updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
 
     updateSummary(sharedPreferences, keyPrefRoomServerUrl);
     updateSummaryB(sharedPreferences, keyPrefDisplayHud);
     updateSummaryB(sharedPreferences, keyPrefTracing);
+
+    // Disable forcing WebRTC based AEC so it won't affect our value.
+    // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would always return false.
+    WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(false);
+    if (!WebRtcAudioUtils.isAcousticEchoCancelerSupported()) {
+      Preference disableBuiltInAECPreference =
+          settingsFragment.findPreference(keyprefDisableBuiltInAEC);
+
+
+      disableBuiltInAECPreference.setSummary(getString(R.string.pref_built_in_aec_not_available));
+      disableBuiltInAECPreference.setEnabled(false);
+    }
   }
 
   @Override
@@ -135,6 +152,7 @@ public class SettingsActivity extends Activity
         || key.equals(keyprefNoAudioProcessing)
         || key.equals(keyprefAecDump)
         || key.equals(keyprefOpenSLES)
+        || key.equals(keyprefDisableBuiltInAEC)
         || key.equals(keyPrefDisplayHud)) {
       updateSummaryB(sharedPreferences, key);
     }