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

Commit 0a760130 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge 6ebb6aea on remote branch"

parents 14030e8c 0a277458

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

+2 −11
Original line number Diff line number Diff line
@@ -31,9 +31,8 @@ import android.os.SystemProperties; 
import android.telephony.MSimTelephonyManager;

import android.telephony.PhoneNumberUtils;

import android.telephony.PhoneStateListener;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.telephony.Rlog;



import java.util.ArrayList;

import java.util.Collections;
@@ -458,12 +457,6 @@ public class CallManager { 
        return phone;

    }



    private boolean isImsOnWifi(Phone offHookPhone) {

        return (offHookPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS &&

                offHookPhone.getServiceState().getDataNetworkType() !=

                        TelephonyManager.NETWORK_TYPE_LTE);

    }



    public void setAudioMode() {

        Context context = getContext();

        if (context == null) return;
@@ -500,11 +493,9 @@ public class CallManager { 
                }



                int newAudioMode = AudioManager.MODE_IN_CALL;

                if (offhookPhone instanceof SipPhone || isImsOnWifi(offhookPhone)) {

                if (offhookPhone instanceof SipPhone) {

                    Rlog.d(LOG_TAG, "setAudioMode Set audio mode for SIP call!");

                    // enable IN_COMMUNICATION audio mode instead for sipPhone

                    // or for IMS calls over wifi

                    Rlog.d(LOG_TAG, "setAudioMode Set audio mode for SIP or wifi call!");

                    newAudioMode = AudioManager.MODE_IN_COMMUNICATION;

                }

                int currMode = audioManager.getMode();