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

Commit 1d7647ae authored by Jonathan Basseri's avatar Jonathan Basseri Committed by Android (Google) Code Review
Browse files

Merge "Read VOLTE replacement RAT from carrier config." into mnc-dev

parents 2dc7607b 70064133

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

+16 −7
Original line number Original line Diff line number Diff line
@@ -27,8 +27,10 @@ import android.os.AsyncResult; 
import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.os.Handler;

import android.os.Message;

import android.os.Message;

import android.os.PersistableBundle;

import android.os.SystemProperties;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserHandle;

import android.telephony.CarrierConfigManager;

import android.telephony.CellInfo;

import android.telephony.CellInfo;

import android.telephony.CellLocation;

import android.telephony.CellLocation;

import android.telephony.Rlog;

import android.telephony.Rlog;
@@ -177,14 +179,21 @@ public class PhoneProxy extends Handler implements Phone { 




        if (mActivePhone != null) {

        if (mActivePhone != null) {

            // Check for a voice over lte replacement

            // Check for a voice over lte replacement

            if ((newVoiceRadioTech == ServiceState.RIL_RADIO_TECHNOLOGY_LTE) ||

            if ((newVoiceRadioTech == ServiceState.RIL_RADIO_TECHNOLOGY_LTE)

                    (newVoiceRadioTech == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN)) {

                    || (newVoiceRadioTech == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN)) {

                int volteReplacementRat = mActivePhone.getContext().getResources().getInteger(

                CarrierConfigManager configMgr = (CarrierConfigManager)

                        com.android.internal.R.integer.config_volte_replacement_rat);

                        mActivePhone.getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

                PersistableBundle b = configMgr.getConfigForSubId(mActivePhone.getSubId());

                if (b != null) {

                    int volteReplacementRat =

                            b.getInt(CarrierConfigManager.KEY_VOLTE_REPLACEMENT_RAT_INT);

                    logd("phoneObjectUpdater: volteReplacementRat=" + volteReplacementRat);

                    logd("phoneObjectUpdater: volteReplacementRat=" + volteReplacementRat);

                    if (volteReplacementRat != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {

                    if (volteReplacementRat != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {

                        newVoiceRadioTech = volteReplacementRat;

                        newVoiceRadioTech = volteReplacementRat;

                    }

                    }

                } else {

                    loge("phoneObjectUpdater: didn't get volteReplacementRat from carrier config");

                }

            }

            }





            if(mRilVersion == 6 && getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {

            if(mRilVersion == 6 && getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {