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

Commit 89437935 authored by Adnan Begovic's avatar Adnan Begovic
Browse files

PhoneProxy: Restore previous updatePhoneObject logic. 

	No reason to do an opt-in with a boolean, most cdma devices with >= v6 RIL should be
	able to update their IccCardProxy when triggered by an EVENT_ICC_CHANGED
	message.

Change-Id: Ica92c2d53e9d3551d3abe8b460b80d0d381ac5bb
parent f3b29ddf

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

+2 −5
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ public class PhoneProxy extends Handler implements Phone { 
    private boolean mResetModemOnRadioTechnologyChange = false;



    private int mRilVersion;

    private boolean mRilV7NeedsCDMALTEPhone = SystemProperties.getBoolean(

                    "telephony.rilV7NeedCDMALTEPhone", false);



    private static final int EVENT_VOICE_RADIO_TECH_CHANGED = 1;

    private static final int EVENT_RADIO_ON = 2;
@@ -143,10 +141,9 @@ public class PhoneProxy extends Handler implements Phone { 
    private void updatePhoneObject(int newVoiceRadioTech) {



        if (mActivePhone != null) {

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

                mRilV7NeedsCDMALTEPhone) {

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

                /*

                 * On v6 RIL, when LTE_ON_CDMA is TRUE, always create CDMALTEPhone

                 * On v6 or greater RIL, when LTE_ON_CDMA is TRUE, always create CDMALTEPhone

                 * irrespective of the voice radio tech reported. Handle instance

                 * where device may be global phone, reporting as cdma device. Don't update

                 * voice tech in that scenario.