am 63114dbb: am a45ddc61: Merge "Do not set audioGroup ECHO SUPRESSION mode" (ebdd8177) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CallManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -965,18 +965,18 @@ public final class CallManager {
		/**
		* Enables or disables echo suppression.
		*/
		public void setEchoSuppressionEnabled(boolean enabled) {
		public void setEchoSuppressionEnabled() {
		if (VDBG) {
		Rlog.d(LOG_TAG, " setEchoSuppression(" + enabled + ")");
		Rlog.d(LOG_TAG, " setEchoSuppression()");
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) {
		getActiveFgCall().getPhone().setEchoSuppressionEnabled(enabled);
		getActiveFgCall().getPhone().setEchoSuppressionEnabled();
		}

		if (VDBG) {
		Rlog.d(LOG_TAG, "End setEchoSuppression(" + enabled + ")");
		Rlog.d(LOG_TAG, "End setEchoSuppression()");
		Rlog.d(LOG_TAG, toString());
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1146,7 +1146,7 @@ public interface Phone {
		/**
		* Enables or disables echo suppression.
		*/
		void setEchoSuppressionEnabled(boolean enabled);
		void setEchoSuppressionEnabled();

		/**
		* Invokes RIL_REQUEST_OEM_HOOK_RAW on RIL implementation.

+1 −1

Original line number	Diff line number	Diff line
		@@ -730,7 +730,7 @@ public abstract class PhoneBase extends Handler implements Phone {
		}

		@Override
		public void setEchoSuppressionEnabled(boolean enabled) {
		public void setEchoSuppressionEnabled() {
		// no need for regular phone
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -814,8 +814,8 @@ public class PhoneProxy extends Handler implements Phone {
		}

		@Override
		public void setEchoSuppressionEnabled(boolean enabled) {
		mActivePhone.setEchoSuppressionEnabled(enabled);
		public void setEchoSuppressionEnabled() {
		mActivePhone.setEchoSuppressionEnabled();
		}

		@Override

+8 −7

Original line number	Diff line number	Diff line
		@@ -331,16 +331,17 @@ public class SipPhone extends SipPhoneBase {
		}

		@Override
		public void setEchoSuppressionEnabled(boolean enabled) {
		// TODO: Remove the enabled argument. We should check the speakerphone
		// state with AudioManager instead of keeping a state here so the
		// method with a state argument is redundant. Also rename the method
		// to something like onSpeaerphoneStateChanged(). Echo suppression may
		// not be available on every device.
		public void setEchoSuppressionEnabled() {
		// Echo suppression may not be available on every device. So, check
		// whether it is supported
		synchronized (SipPhone.class) {
		AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
		String echoSuppression = audioManager.getParameters("ec_supported");
		if (echoSuppression.contains("off")) {
		mForegroundCall.setAudioGroupMode();
		}
		}
		}

		@Override
		public void setMute(boolean muted) {