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

Commit f2e9edc7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topics "enable_new_data_default",... 

Merge changes from topics "enable_new_data_default", "presubmit-am-19168ef09d5542b3b19f230396b120ce" into tm-dev

* changes:
  Default unit tests to use new data stack
  Add preferredDataProfile teardown check
parents 02a62223 84a87bc6

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

+2 −1
Original line number Diff line number Diff line
@@ -1483,7 +1483,8 @@ public class DataNetworkController extends Handler { 


        // If users switch preferred profile in APN editor, we need to tear down network.

        if (dataNetwork.isInternetSupported()

                && !mDataProfileManager.isDataProfilePreferred(dataProfile)) {

                && !mDataProfileManager.isDataProfilePreferred(dataProfile)

                && mDataProfileManager.isAnyPreferredDataProfileExisting()) {

            evaluation.addDataDisallowedReason(DataDisallowedReason.DATA_PROFILE_NOT_PREFERRED);

        }

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

+12 −0
Original line number Diff line number Diff line
@@ -698,6 +698,18 @@ public class DataProfileManager extends Handler { 
        return dataProfile.equals(mPreferredDataProfile);

    }



    /**

     * Check if any preferred data profile exists.

     *

     * @return {@code true} if any preferred data profile exists

     */

    public boolean isAnyPreferredDataProfileExisting() {

        for (DataProfile dataProfile : mAllDataProfiles) {

            if (dataProfile.isPreferred()) return true;

        }

        return false;

    }



    /**

     * Dedupe the similar data profiles.

     */

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

+2 −1
Original line number Diff line number Diff line
@@ -1719,6 +1719,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testImsRegisteredDelayShutDown() throws Exception {

        doReturn(false).when(mPhone).isUsingNewDataStack();

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        mContextFixture.putIntResource(

                com.android.internal.R.integer.config_delay_for_ims_dereg_millis, 1000 /*ms*/);
@@ -1759,6 +1760,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testImsRegisteredDelayShutDownTimeout() throws Exception {

        doReturn(false).when(mPhone).isUsingNewDataStack();

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        mContextFixture.putIntResource(

                com.android.internal.R.integer.config_delay_for_ims_dereg_millis, 1000 /*ms*/);
@@ -2203,7 +2205,6 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


    @Test

    public void testUpdateNrFrequencyRangeFromPhysicalChannelConfigs() {

        doReturn(true).when(mPhone).isUsingNewDataStack();

        when(mPhone.getDataNetworkController().isInternetNetwork(eq(3))).thenReturn(true);

        sendPhyChanConfigChange(new int[] {1000, 500}, TelephonyManager.NETWORK_TYPE_NR, 1,

                new int[][]{{0, 1}, {2, 3}});

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

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ public abstract class TelephonyTest { 
        doReturn(mDataProfileManager).when(mDataNetworkController).getDataProfileManager();

        doReturn(mDataRetryManager).when(mDataNetworkController).getDataRetryManager();

        doReturn(mCarrierPrivilegesTracker).when(mPhone).getCarrierPrivilegesTracker();

        doReturn(true).when(mPhone).isUsingNewDataStack();



        //mUiccController

        doReturn(mUiccCardApplication3gpp).when(mUiccController).getUiccCardApplication(anyInt(),

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

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ public class AccessNetworksManagerTest extends TelephonyTest { 
        mMockedQns = mock(IQualifiedNetworksService.class);

        mMockedIBinder = mock(IBinder.class);



        doReturn(true).when(mPhone).isUsingNewDataStack();



        addQnsService();

        mContextFixture.putResource(

                com.android.internal.R.string.config_qualified_networks_service_package,