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

Commit 3de51440 authored by Jack Yu's avatar Jack Yu
Browse files

Cleaned up the flag reconnect_qualified_network 

Cleaned up the 24Q3 flag reconnect_qualified_network

Test: atest AccessNetworksManagerTest
Test: Basic telephony functionality tests
Bug: 319520561
Flag: EXEMPT flag cleanup
Change-Id: I371ee5d80a4a518abd58e1368fc20064c702655e
parent 11a51c6b

flags/data.aconfig

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

}



# OWNER=sewook TARGET=24Q3

flag {

  name: "reconnect_qualified_network"

  namespace: "telephony"

  description: "This flag is for internal implementation to handle reconnect request from QNS in telephony FWK."

  bug: "319520561"

}



# OWNER=jackyu TARGET=24Q3

flag {

  name: "dsrs_diagnostics_enabled"

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

+5 −7
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ public class AccessNetworksManager extends Handler { 


        @Override

        public void onReconnectQualifiedNetworkType(int apnTypes, int qualifiedNetworkType) {

            if (mFeatureFlags.reconnectQualifiedNetwork()) {

            log("onReconnectQualifiedNetworkType: apnTypes = ["

                    + ApnSetting.getApnTypesStringFromBitmask(apnTypes)

                    + "], networks = [" + AccessNetworkType.toString(qualifiedNetworkType)
@@ -355,7 +354,6 @@ public class AccessNetworksManager extends Handler { 
            handleQualifiedNetworksChanged(apnTypes, new int[]{qualifiedNetworkType}, true);

        }

    }

    }



    private void onEmergencyDataNetworkPreferredTransportChanged(

            @AccessNetworkConstants.TransportType int transportType) {

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

+1 −29
Original line number Diff line number Diff line
@@ -350,10 +350,7 @@ public class AccessNetworksManagerTest extends TelephonyTest { 
    }



    @Test

    public void testCallbackForReconnectQualifiedNetworkTypeWithFlagEnabled()  throws Exception {

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





    public void testCallbackForReconnectQualifiedNetworkType()  throws Exception {

        mAccessNetworksManager.registerCallback(mMockedCallback);



        mQnsCallback.onReconnectQualifiedNetworkType(ApnSetting.TYPE_IMS | ApnSetting.TYPE_MMS,
@@ -377,29 +374,4 @@ public class AccessNetworksManagerTest extends TelephonyTest { 
                NetworkCapabilities.NET_CAPABILITY_XCAP)).isEqualTo(

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

    }



    @Test

    public void testCallbackForReconnectQualifiedNetworkTypeWithFlagDisabled() throws Exception {

        when(mFeatureFlags.reconnectQualifiedNetwork()).thenReturn(false);

        mQnsCallback.onReconnectQualifiedNetworkType(ApnSetting.TYPE_IMS | ApnSetting.TYPE_MMS,

                AccessNetworkType.IWLAN);

        processAllMessages();



        verify(mMockedCallback, never()).onPreferredTransportChanged(

                eq(NetworkCapabilities.NET_CAPABILITY_MMS), eq(true));

        verify(mMockedCallback, never()).onPreferredTransportChanged(

                eq(NetworkCapabilities.NET_CAPABILITY_IMS), eq(true));

        verify(mMockedCallback, never()).onPreferredTransportChanged(

                eq(NetworkCapabilities.NET_CAPABILITY_XCAP), eq(true));

        Mockito.clearInvocations(mMockedCallback);

        assertThat(mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                NetworkCapabilities.NET_CAPABILITY_MMS)).isEqualTo(

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        assertThat(mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                NetworkCapabilities.NET_CAPABILITY_IMS)).isEqualTo(

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        assertThat(mAccessNetworksManager.getPreferredTransportByNetworkCapability(

                NetworkCapabilities.NET_CAPABILITY_XCAP)).isEqualTo(

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

    }

}