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

Commit c6c7b99e authored by Jack Yu's avatar Jack Yu
Browse files

Cleaned up 24Q1 flags 

Cleaned up the flags was bumpped to nextfood in 24Q1.

Fix: 360399305
Test: Basic telephony functionality tests
Flag: EXEMPT flag removal
Change-Id: I83d858dfd8f3e246d3eb6d2d2b2c78f22b0c5b6a
parent 2e69b68b

flags/data.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -58,14 +58,6 @@ flag { 
  bug: "303922311"

}



# OWNER=linggm TARGET=24Q1

flag {

  name: "relax_ho_teardown"

  namespace: "telephony"

  description: "Relax handover tear down if the device is currently in voice call."

  bug: "270895912"

}



# OWNER=linggm TARGET=24Q2

flag {

  name: "allow_mmtel_in_non_vops"

src/java/com/android/internal/telephony/data/DataNetworkController.java

+1 −2
Original line number Diff line number Diff line
@@ -3619,8 +3619,7 @@ public class DataNetworkController extends Handler { 
            dataNetwork.startHandover(targetTransport, dataHandoverRetryEntry);

        } else if (dataNetwork.shouldDelayImsTearDownDueToInCall()

                && (dataEvaluation.containsOnly(DataDisallowedReason.NOT_IN_SERVICE)

                || mFeatureFlags.relaxHoTeardown() && dataEvaluation.isSubsetOf(

                        DataDisallowedReason.NOT_IN_SERVICE,

                || dataEvaluation.isSubsetOf(DataDisallowedReason.NOT_IN_SERVICE,

                        DataDisallowedReason.NOT_ALLOWED_BY_POLICY))) {

            // We try our best to preserve the voice call by retrying later

            if (dataHandoverRetryEntry != null) {

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -2844,7 +2844,6 @@ public class DataNetworkControllerTest extends TelephonyTest { 


    @Test

    public void testHandoverDataNetworkNotAllowedByPolicyDelayDueToVoiceCall() throws Exception {

        doReturn(true).when(mFeatureFlags).relaxHoTeardown();

        // Config delay IMS tear down enabled

        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_DELAY_IMS_TEAR_DOWN_UNTIL_CALL_END_BOOL,

                true);