Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebdd8177 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 63114dbb: am a45ddc61: Merge "Do not set audioGroup ECHO SUPRESSION mode" 

* commit '63114dbb':
  Do not set audioGroup ECHO SUPRESSION mode
parents 9a33dbff 63114dbb

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -965,18 +965,18 @@ public final class CallManager { 
    /**

    /**

     * Enables or disables echo suppression.

     * Enables or disables echo suppression.

     */

     */

    public void setEchoSuppressionEnabled(boolean enabled) {

    public void setEchoSuppressionEnabled() {

        if (VDBG) {

        if (VDBG) {

            Rlog.d(LOG_TAG, " setEchoSuppression(" + enabled + ")");

            Rlog.d(LOG_TAG, " setEchoSuppression()");

            Rlog.d(LOG_TAG, toString());

            Rlog.d(LOG_TAG, toString());

        }

        }





        if (hasActiveFgCall()) {

        if (hasActiveFgCall()) {

            getActiveFgCall().getPhone().setEchoSuppressionEnabled(enabled);

            getActiveFgCall().getPhone().setEchoSuppressionEnabled();

        }

        }





        if (VDBG) {

        if (VDBG) {

            Rlog.d(LOG_TAG, "End setEchoSuppression(" + enabled + ")");

            Rlog.d(LOG_TAG, "End setEchoSuppression()");

            Rlog.d(LOG_TAG, toString());

            Rlog.d(LOG_TAG, toString());

        }

        }

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1146,7 +1146,7 @@ public interface Phone { 
    /**

    /**

     * Enables or disables echo suppression.

     * Enables or disables echo suppression.

     */

     */

    void setEchoSuppressionEnabled(boolean enabled);

    void setEchoSuppressionEnabled();





    /**

    /**

     * Invokes RIL_REQUEST_OEM_HOOK_RAW on RIL implementation.

     * Invokes RIL_REQUEST_OEM_HOOK_RAW on RIL implementation.

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

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

    }





    @Override

    @Override

    public void setEchoSuppressionEnabled(boolean enabled) {

    public void setEchoSuppressionEnabled() {

        // no need for regular phone

        // no need for regular phone

    }

    }

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

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

    }





    @Override

    @Override

    public void setEchoSuppressionEnabled(boolean enabled) {

    public void setEchoSuppressionEnabled() {

        mActivePhone.setEchoSuppressionEnabled(enabled);

        mActivePhone.setEchoSuppressionEnabled();

    }

    }





    @Override

    @Override

src/java/com/android/internal/telephony/sip/SipPhone.java

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

    }





    @Override

    @Override

    public void setEchoSuppressionEnabled(boolean enabled) {

    public void setEchoSuppressionEnabled() {

        // TODO: Remove the enabled argument. We should check the speakerphone

        // Echo suppression may not be available on every device. So, check

        // state with AudioManager instead of keeping a state here so the

        // whether it is supported

        // method with a state argument is redundant. Also rename the method

        // to something like onSpeaerphoneStateChanged(). Echo suppression may

        // not be available on every device.

        synchronized (SipPhone.class) {

        synchronized (SipPhone.class) {

            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);

            String echoSuppression = audioManager.getParameters("ec_supported");

            if (echoSuppression.contains("off")) {

                mForegroundCall.setAudioGroupMode();

                mForegroundCall.setAudioGroupMode();

            }

            }

        }

        }

    }





    @Override

    @Override

    public void setMute(boolean muted) {

    public void setMute(boolean muted) {