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

Commit 7dda4850 authored by Gary Jian's avatar Gary Jian
Browse files

Use default VoNR setting if the setting has not been overwritten before 

Check the KEY_VONR_ON_BY_DEFAULT_BOOL value when we set the first VoNR
setting. 

Bug: 237621350
Test: manual
Change-Id: I2a8aee7383965aa96c07e1b8db30db21e7ec7771
parent 0611a83a

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

+8 −2
Original line number Diff line number Diff line
@@ -4804,6 +4804,8 @@ public class GsmCdmaPhone extends Phone { 


        boolean mIsVonrEnabledByCarrier =

                config.getBoolean(CarrierConfigManager.KEY_VONR_ENABLED_BOOL);

        boolean mDefaultVonr =

                config.getBoolean(CarrierConfigManager.KEY_VONR_ON_BY_DEFAULT_BOOL);



        String result = SubscriptionController.getInstance().getSubscriptionProperty(

                getSubId(),
@@ -4817,11 +4819,15 @@ public class GsmCdmaPhone extends Phone { 
        logd("VoNR setting from telephony.db:"

                + setting

                + " ,vonr_enabled_bool:"

                + mIsVonrEnabledByCarrier);

                + mIsVonrEnabledByCarrier

                + " ,vonr_on_by_default_bool:"

                + mDefaultVonr);



        if (!mIsVonrEnabledByCarrier) {

            mCi.setVoNrEnabled(false, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), null);

        } else if (setting == 1 || setting == -1) {

        } else if (setting == -1) {

            mCi.setVoNrEnabled(mDefaultVonr, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), null);

        } else if (setting == 1) {

            mCi.setVoNrEnabled(true, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), null);

        } else if (setting == 0) {

            mCi.setVoNrEnabled(false, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), null);