|
@@ -125,22 +125,8 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
|
|
mCallback.joinRoomSucc();
|
|
mCallback.joinRoomSucc();
|
|
}
|
|
}
|
|
|
|
|
|
- /*if (isHeadphonesPlugged()) {
|
|
|
|
- toggleHeadset(true);
|
|
|
|
- } else {
|
|
|
|
- if (mIsAudioOnly)
|
|
|
|
- toggleSpeaker(false);
|
|
|
|
- else {
|
|
|
|
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
|
|
|
- audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
|
|
|
|
- } else {
|
|
|
|
- audioManager.setMode(AudioManager.MODE_IN_CALL);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
toggleSpeaker(true);
|
|
toggleSpeaker(true);
|
|
- audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
|
|
|
|
|
|
+ audioManager.setMode(AudioManager.MODE_IN_CALL);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -373,7 +359,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
|
|
public boolean toggleSpeaker(boolean enable) {
|
|
public boolean toggleSpeaker(boolean enable) {
|
|
if (audioManager != null) {
|
|
if (audioManager != null) {
|
|
isSpeakerOn = enable;
|
|
isSpeakerOn = enable;
|
|
- audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
|
|
|
|
|
|
+ audioManager.setMode(AudioManager.MODE_IN_CALL);
|
|
if (enable) {
|
|
if (enable) {
|
|
audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
|
|
audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
|
|
audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL),
|
|
audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL),
|