Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4a054c1a: am cfd15dd3: Fix the IN_CALL mode issue.

Browse Source 
Merge commit '4a054c1a5d7ee2db6c738ede002a35145b226588'

* commit '4a054c1a5d7ee2db6c738ede002a35145b226588':
  Fix the IN_CALL mode issue.
This commit is contained in:
Chung-yih Wang
2010-08-16 15:18:48 -07:00
committed by Android Git Automerger
parent a10382b67d 4a054c1a5d
commit 8f1cf851cd
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
voip/java/android/net/sip/SipAudioCall.java
View File

@@ -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();

21
voip/java/android/net/sip/SipAudioCallImpl.java
View File

@@ -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() {