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

Commit d7c657c1 authored by Jack Yu's avatar Jack Yu Committed by Nathan Harold
Browse files

Cleaned up the flag enable_carrier_config_n1_control_attempt2 

Cleaned up the 24Q1 flag enable_carrier_config_n1_control_attempt2

Bug: 328848947
Test: Basic telephony functionality tests
Test: atest FrameworksTelephonyTests
Flag: EXEMPT removing flag
Change-Id: Ib40da35d25855f7afa9a934d51e3946b45ff5fdb
parent 3bac7177

flags/network.aconfig

+0 −12
Original line number Diff line number Diff line 
package: "com.android.internal.telephony.flags"

container: "system"



# OWNER=nharold TARGET=24Q1

flag {

    name: "enable_carrier_config_n1_control_attempt2"

    namespace: "telephony"

    description: "enabling this flag allows KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY to control N1 mode enablement"

    bug:"328848947"



    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=sarahchin TARGET=24Q1

flag {

  name: "hide_roaming_icon"

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

+14 −20
Original line number Diff line number Diff line
@@ -2463,7 +2463,6 @@ public class GsmCdmaPhone extends Phone { 
     */

    @Override

    public void setN1ModeEnabled(boolean enable, @Nullable Message result) {

        if (mFeatureFlags.enableCarrierConfigN1ControlAttempt2()) {

        // This might be called by IMS on another thread, so to avoid the requirement to

        // lock, post it through the handler.

        post(() -> {
@@ -2478,9 +2477,6 @@ public class GsmCdmaPhone extends Phone { 
                maybeUpdateModemN1Mode(result);

            }

        });

        } else {

            super.setN1ModeEnabled(enable, result);

        }

    }



    /** Only called on the handler thread. */
@@ -2504,8 +2500,6 @@ public class GsmCdmaPhone extends Phone { 


    /** Only called on the handler thread. */

    private void updateCarrierN1ModeSupported(@NonNull PersistableBundle b) {

        if (!mFeatureFlags.enableCarrierConfigN1ControlAttempt2()) return;



        if (!CarrierConfigManager.isConfigForIdentifiedCarrier(b)) return;



        final int[] supportedNrModes = b.getIntArray(

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java

+0 −12
Original line number Diff line number Diff line
@@ -1519,8 +1519,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    @Test

    public void testNrCapabilityChanged_firstRequest_incompleteCarrierConfig_changeNeeded() {

        when(mFeatureFlags.enableCarrierConfigN1ControlAttempt2()).thenReturn(true);



        mPhoneUT.mCi = mMockCi;

        PersistableBundle bundle = mContextFixture.getCarrierConfigBundle();

        bundle.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
@@ -1550,8 +1548,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    @Test

    public void testNrCapabilityChanged_firstRequest_noChangeNeeded() {

        when(mFeatureFlags.enableCarrierConfigN1ControlAttempt2()).thenReturn(true);



        mPhoneUT.mCi = mMockCi;

        PersistableBundle bundle = mContextFixture.getCarrierConfigBundle();

        bundle.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
@@ -1574,8 +1570,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    @Test

    public void testNrCapabilityChanged_firstRequest_needsChange() {

        when(mFeatureFlags.enableCarrierConfigN1ControlAttempt2()).thenReturn(true);



        mPhoneUT.mCi = mMockCi;

        PersistableBundle bundle = mContextFixture.getCarrierConfigBundle();

        bundle.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
@@ -1598,8 +1592,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    @Test

    public void testNrCapabilityChanged_CarrierConfigChanges() {

        when(mFeatureFlags.enableCarrierConfigN1ControlAttempt2()).thenReturn(true);



        // Initialize the inner cache and set the modem to N1 mode = enabled/true

        testNrCapabilityChanged_firstRequest_needsChange();
@@ -1620,8 +1612,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    @Test

    public void testNrCapabilityChanged_CarrierConfigChanges_ErrorResponse() {

        when(mFeatureFlags.enableCarrierConfigN1ControlAttempt2()).thenReturn(true);



        mPhoneUT.mCi = mMockCi;

        for (int i = 0; i < 2; i++) {

            PersistableBundle bundle = mContextFixture.getCarrierConfigBundle();
@@ -1646,8 +1636,6 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    @Test

    public void testNrCapabilityChanged_firstRequest_ImsChanges() {

        when(mFeatureFlags.enableCarrierConfigN1ControlAttempt2()).thenReturn(true);



        mPhoneUT.mCi = mMockCi;

        Message passthroughMessage = mTestHandler.obtainMessage(0xC0FFEE);