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

Commit 3a5817a4 authored by Sarah Chin's avatar Sarah Chin
Browse files

Add missing calls to DataSettingsManager 

Test: atest ImsPhoneCallTrackerTest
Bug: 223222696
Change-Id: Ifb6651546a5a6472575c244a09161cb931156746
Merged-In: Ifb6651546a5a6472575c244a09161cb931156746
parent 7fbd8652

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

+6 −2
Original line number Diff line number Diff line
@@ -3720,8 +3720,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            // Check with the DCTracker to see if data is enabled; there may be a case when

            // ImsPhoneCallTracker isn't being informed of the right data enabled state via its

            // registration, so we'll refresh now.

            boolean isDataEnabled = mPhone.getDefaultPhone().getDataEnabledSettings()

                    .isDataEnabled();

            boolean isDataEnabled;

            if (mPhone.getDefaultPhone().isUsingNewDataStack()) {

                isDataEnabled = mPhone.getDefaultPhone().getDataSettingsManager().isDataEnabled();

            } else {

                isDataEnabled = mPhone.getDefaultPhone().getDataEnabledSettings().isDataEnabled();

            }



            if (DBG) {

                log("onCallHandover ::  srcAccessTech=" + srcAccessTech + ", targetAccessTech="

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

+1 −0
Original line number Diff line number Diff line
@@ -722,6 +722,7 @@ public abstract class TelephonyTest { 
        doReturn(true).when(mDataEnabledSettings).isDataEnabled();

        doReturn(true).when(mDataEnabledSettings).isDataEnabled(anyInt());

        doReturn(true).when(mDataEnabledSettings).isInternalDataEnabled();

        doReturn(true).when(mDataSettingsManager).isDataEnabled();

        doReturn(mNetworkRegistrationInfo).when(mServiceState).getNetworkRegistrationInfo(

                anyInt(), anyInt());

        doReturn(new HalVersion(1, 4)).when(mPhone).getHalVersion();