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

Commit 94525db2 authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge "Add missing calls to DataSettingsManager"

parents c50f9a2e 3a5817a4

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();