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

Commit c8818f07 authored by Jonggeon Kim's avatar Jonggeon Kim
Browse files

Sync with carrier config naming changing 

Sync with carrier config naming changing

Bug: 265109622
Test: atest FrameworksTelephonyTests
Change-Id: I75b33248ac3f44f4392a6f8b040f9008b8fb02f6
parent 1f8e0a19

src/java/com/android/internal/telephony/imsphone/ImsNrSaModeHandler.java

+21 −20
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
package com.android.internal.telephony.imsphone;



import static android.telephony.CarrierConfigManager.CARRIER_NR_AVAILABILITY_SA;

import static android.telephony.CarrierConfigManager.Ims.KEY_SA_DISABLE_POLICY_INT;

import static android.telephony.CarrierConfigManager.Ims.KEY_NR_SA_DISABLE_POLICY_INT;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_NONE;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_WFC_ESTABLISHED;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED;

import static android.telephony.CarrierConfigManager.Ims.NrSaDisablePolicy;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_NONE;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_VOWIFI_REGISTERED;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_WFC_ESTABLISHED;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED;

import static android.telephony.CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY;

import static android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech;

import static android.telephony.ims.stub.ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN;
@@ -100,7 +100,7 @@ public class ImsNrSaModeHandler extends Handler{ 
     */

    public void onImsRegistered(

            @ImsRegistrationTech int imsRadioTech, @NonNull Set<String> featureTags) {

        if (mNrSaDisablePolicy == SA_DISABLE_POLICY_NONE) {

        if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_NONE) {

            return;

        }
@@ -118,12 +118,13 @@ public class ImsNrSaModeHandler extends Handler{ 
        }



        if (isVowifiRegChanged) {

            if (mNrSaDisablePolicy == SA_DISABLE_POLICY_VOWIFI_REGISTERED) {

            if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED) {

                setNrSaMode(!isVowifiRegistered());

            } else if ((mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED

                    || mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED)

            } else if ((mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED

                    || mNrSaDisablePolicy

                    == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED)

                    && isImsCallOngoing()) {

                if (mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED) {

                if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED) {

                    requestIsVonrEnabled(!isVowifiRegistered());

                    return;

                }
@@ -140,7 +141,7 @@ public class ImsNrSaModeHandler extends Handler{ 
     */

    public void onImsUnregistered(

            @ImsRegistrationTech int imsRadioTech) {

        if (mNrSaDisablePolicy == SA_DISABLE_POLICY_NONE

        if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_NONE

                || imsRadioTech != REGISTRATION_TECH_IWLAN || !isVowifiRegistered()) {

            return;

        }
@@ -149,12 +150,12 @@ public class ImsNrSaModeHandler extends Handler{ 


        setVowifiRegStatus(false);



        if (mNrSaDisablePolicy == SA_DISABLE_POLICY_VOWIFI_REGISTERED) {

        if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED) {

            setNrSaMode(true);

        } else if ((mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED

                || mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED)

        } else if ((mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED

                || mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED)

                && isImsCallOngoing()) {

            if (mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED) {

            if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED) {

                requestIsVonrEnabled(true);

                return;

            }
@@ -182,7 +183,7 @@ public class ImsNrSaModeHandler extends Handler{ 
        }



        if (isVowifiRegistered() && isImsCallStatusChanged) {

            if (mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED) {

            if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED) {

                requestIsVonrEnabled(!isImsCallOngoing());

                return;

            }
@@ -260,8 +261,8 @@ public class ImsNrSaModeHandler extends Handler{ 
    private void setNrSaDisablePolicy(int subId) {

        if (mPhone.getSubId() == subId && mCarrierConfigManager != null) {

            PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),

                    KEY_SA_DISABLE_POLICY_INT, KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

            mNrSaDisablePolicy = bundle.getInt(KEY_SA_DISABLE_POLICY_INT);

                    KEY_NR_SA_DISABLE_POLICY_INT, KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

            mNrSaDisablePolicy = bundle.getInt(KEY_NR_SA_DISABLE_POLICY_INT);

            mIsNrSaSupported = Arrays.stream(

                    bundle.getIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY)).anyMatch(

                        value -> value == CARRIER_NR_AVAILABILITY_SA);
@@ -269,8 +270,8 @@ public class ImsNrSaModeHandler extends Handler{ 
            Log.d(TAG, "setNrSaDisablePolicy : NrSaDisablePolicy = "

                    + mNrSaDisablePolicy + ", IsNrSaSupported = "  + mIsNrSaSupported);



            if (mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED

                    || mNrSaDisablePolicy == SA_DISABLE_POLICY_WFC_ESTABLISHED) {

            if (mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED

                    || mNrSaDisablePolicy == NR_SA_DISABLE_POLICY_WFC_ESTABLISHED) {

                registerForPreciseCallStateChanges();

            } else {

                unregisterForPreciseCallStateChanges();

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsNrSaModeHandlerTest.java

+17 −16
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.internal.telephony.imsphone; 


import static android.telephony.CarrierConfigManager.CARRIER_NR_AVAILABILITY_NSA;

import static android.telephony.CarrierConfigManager.CARRIER_NR_AVAILABILITY_SA;

import static android.telephony.CarrierConfigManager.Ims.KEY_SA_DISABLE_POLICY_INT;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_NONE;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_VOWIFI_REGISTERED;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_WFC_ESTABLISHED;

import static android.telephony.CarrierConfigManager.Ims.SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED;

import static android.telephony.CarrierConfigManager.Ims.KEY_NR_SA_DISABLE_POLICY_INT;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_NONE;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_WFC_ESTABLISHED;

import static android.telephony.CarrierConfigManager.Ims.NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED;

import static android.telephony.CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY;

import static android.telephony.ims.stub.ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN;

import static android.telephony.ims.stub.ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
@@ -108,7 +108,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testTearDown() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_WFC_ESTABLISHED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_WFC_ESTABLISHED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -131,7 +131,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testOnImsRegisteredWithSaDisablePolicyNone() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_NONE);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_NONE);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -147,7 +147,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testOnImsRegisteredWithSaDisablePolicyWfcEstablished() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_WFC_ESTABLISHED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_WFC_ESTABLISHED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -168,7 +168,8 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testOnImsRegisteredWithSaDisablePolicyWfcEstablishedWithVonrDisabled() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED);

                KEY_NR_SA_DISABLE_POLICY_INT,

                NR_SA_DISABLE_POLICY_WFC_ESTABLISHED_WHEN_VONR_DISABLED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -226,7 +227,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testOnImsRegisteredWithSaDisablePolicyVowifiRegistered() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_VOWIFI_REGISTERED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -252,7 +253,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testOnImsUnregisteredDoNothingIfNotVowifiRegNoti() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_VOWIFI_REGISTERED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -268,7 +269,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testOnImsUnregisteredWithSaDisablePolicyVowifiRegistered() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_VOWIFI_REGISTERED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -294,7 +295,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testOnPreciseCallStateChangedWithSaDisablePolicyWfcEstablished() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_WFC_ESTABLISHED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_WFC_ESTABLISHED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -345,7 +346,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testUnregisterForPreciseCallStateChangeIfNeeded() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_WFC_ESTABLISHED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_WFC_ESTABLISHED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_SA});
@@ -356,7 +357,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
        mPreciseCallStateHandler = mPreciseCallStateHandlerCaptor.getValue();



        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_VOWIFI_REGISTERED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_VOWIFI_REGISTERED);



        mCarrierConfigChangeListener.onCarrierConfigChanged(mAnyInt, mAnyInt, mAnyInt, mAnyInt);
@@ -366,7 +367,7 @@ public final class ImsNrSaModeHandlerTest extends TelephonyTest{ 
    @Test

    public void testNrSaModeIsNotHandledWhenNotSupported() {

        mContextFixture.getCarrierConfigBundle().putInt(

                KEY_SA_DISABLE_POLICY_INT, SA_DISABLE_POLICY_WFC_ESTABLISHED);

                KEY_NR_SA_DISABLE_POLICY_INT, NR_SA_DISABLE_POLICY_WFC_ESTABLISHED);

        mContextFixture.getCarrierConfigBundle().putIntArray(

                KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_NSA});