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

Commit 9f00abc4 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Check phone in call for DataDuringCall" am: 3c98586f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2459149



Change-Id: I10073ce2f87d023596869738a22d259bac719cae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22fd5072 3c98586f

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import android.util.LocalLog; 




import com.android.internal.telephony.GlobalSettingsHelper;

import com.android.internal.telephony.GlobalSettingsHelper;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.SettingsObserver;

import com.android.internal.telephony.SettingsObserver;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.data.DataConfigManager.DataConfigManagerCallback;

import com.android.internal.telephony.data.DataConfigManager.DataConfigManagerCallback;
@@ -709,7 +710,7 @@ public class DataSettingsManager extends Handler { 
        // mobile data policy : data during call

        // mobile data policy : data during call

        if (isMobileDataPolicyEnabled(TelephonyManager

        if (isMobileDataPolicyEnabled(TelephonyManager

                .MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL)) {

                .MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL)) {

            overridden = isNonDds;

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

        }

        }

        return overridden;

        return overridden;

    }

    }

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

+11 −2
Original line number Original line Diff line number Diff line
@@ -1625,8 +1625,6 @@ public class DataNetworkControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testIsDataEnabledOverriddenForApn_dataDuringCall() throws Exception {

    public void testIsDataEnabledOverriddenForApn_dataDuringCall() throws Exception {

        // Note: we don't check phone call status in DSMGR as the check should already been done in

        // PhoneSwitcher when routing requests.

        doReturn(1).when(mPhone).getSubId();

        doReturn(1).when(mPhone).getSubId();

        doReturn(2).when(mSubscriptionController).getDefaultDataSubId();

        doReturn(2).when(mSubscriptionController).getDefaultDataSubId();

        // Data disabled

        // Data disabled
@@ -1638,6 +1636,17 @@ public class DataNetworkControllerTest extends TelephonyTest { 
                .MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL, true);

                .MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL, true);

        processAllMessages();

        processAllMessages();





        // No active phone call

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();

        mDataNetworkControllerUT.addNetworkRequest(

                createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_INTERNET));

        processAllMessages();



        // Verify no internet connection due to no active phone call

        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);



        // Phone ringing

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

        mDataNetworkControllerUT.addNetworkRequest(

        mDataNetworkControllerUT.addNetworkRequest(

                createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_INTERNET));

                createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_INTERNET));

        processAllMessages();

        processAllMessages();