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

Commit 4a054c1a authored by Chung-yih Wang's avatar Chung-yih Wang Committed by Android Git Automerger
Browse files

am cfd15dd3: Fix the IN_CALL mode issue. 

Merge commit 'cfd15dd3' into gingerbread-plus-aosp

* commit 'cfd15dd3':
  Fix the IN_CALL mode issue.
parents 2e47052f cfd15dd3

voip/java/android/net/sip/SipAudioCall.java

+1 −4
Original line number Diff line number Diff line
@@ -191,11 +191,8 @@ public interface SipAudioCall { 
     */

    void continueCall() throws SipException;



    /** Puts the device to in-call mode. */

    void setInCallMode();



    /** Puts the device to speaker mode. */

    void setSpeakerMode();

    void setSpeakerMode(boolean speakerMode);



    /** Toggles mute. */

    void toggleMute();

voip/java/android/net/sip/SipAudioCallImpl.java

+10 −11
Original line number Diff line number Diff line
@@ -485,16 +485,9 @@ public class SipAudioCallImpl extends SipSessionAdapter 
        return mMuted;

    }



    public synchronized void setInCallMode() {

    public synchronized void setSpeakerMode(boolean speakerMode) {

        ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE))

                .setSpeakerphoneOn(false);

        ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE))

                .setMode(AudioManager.MODE_NORMAL);

    }



    public synchronized void setSpeakerMode() {

        ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE))

                .setSpeakerphoneOn(true);

                .setSpeakerphoneOn(speakerMode);

    }



    public void sendDtmf(int code) {
@@ -587,8 +580,15 @@ public class SipAudioCallImpl extends SipSessionAdapter 
                    Log.d(TAG, "   not sending");

                    audioStream.setMode(RtpStream.MODE_RECEIVE_ONLY);

                }

            } else {

                /* The recorder volume will be very low if the device is in

                 * IN_CALL mode. Therefore, we have to set the mode to NORMAL

                 * in order to have the normal microphone level.

                 */

                ((AudioManager) mContext.getSystemService

                        (Context.AUDIO_SERVICE))

                        .setMode(AudioManager.MODE_NORMAL);

            }

            setInCallMode();



            AudioGroup audioGroup = new AudioGroup();

            audioStream.join(audioGroup);
@@ -614,7 +614,6 @@ public class SipAudioCallImpl extends SipSessionAdapter 
                mRtpSession = null;

            }

        }

        setInCallMode();

    }



    private int getLocalMediaPort() {