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

Commit d8f0e76d authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Fix isDataEnabledOverriddenForApn" into udc-dev

parents 0ccbc010 a00f910b

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

+2 −2
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ public class DataSettingsManager extends Handler { 
        // mobile data policy : data during call

        if (isMobileDataPolicyEnabled(TelephonyManager

                .MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL)) {

            overridden = isNonDds && mPhone.getState() != PhoneConstants.State.IDLE;

            overridden = overridden || isNonDds && mPhone.getState() != PhoneConstants.State.IDLE;

        }



        // mobile data policy : auto data switch
@@ -776,7 +776,7 @@ public class DataSettingsManager extends Handler { 
            if (defaultDataPhone == null) {

                loge("isDataEnabledOverriddenForApn: unexpected defaultDataPhone is null");

            } else {

                overridden = isNonDds && defaultDataPhone.isUserDataEnabled();

                overridden = overridden || isNonDds && defaultDataPhone.isUserDataEnabled();

            }

        }

        return overridden;

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

+12 −1
Original line number Diff line number Diff line
@@ -1746,9 +1746,20 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        // Verify internet connection

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET);



        // Disable auto data switch mobile policy

        // Disable auto data switch mobile policy, but enabled data during call

        mDataNetworkControllerUT.getDataSettingsManager().setMobileDataPolicy(TelephonyManager

                .MOBILE_DATA_POLICY_AUTO_DATA_SWITCH, false);

        mDataNetworkControllerUT.getDataSettingsManager().setMobileDataPolicy(TelephonyManager

                .MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL, true);

        doReturn(PhoneConstants.State.RINGING).when(phone2).getState();

        processAllMessages();



        // Verify internet connection

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET);



        // Disable data during call

        mDataNetworkControllerUT.getDataSettingsManager().setMobileDataPolicy(TelephonyManager

                .MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL, false);

        processAllMessages();



        // Verify no internet connection