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

Commit 9f3a5989 authored by Sarah Chin's avatar Sarah Chin
Browse files

Remove unnecessary checks for testOverrideUnmetered 

Checks were moved from DataConnection to DCT, so no need to keep them in
the tests.

Test: atest DataConnectionTest
Fix: 180984810
Change-Id: I117d2de06ca82d0450a877a099aa1b9cba224bb0
parent 7eaeea5f

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+0 −11
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ import android.telephony.AccessNetworkConstants; 
import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.CarrierConfigManager;

import android.telephony.ServiceState;

import android.telephony.TelephonyDisplayInfo;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.telephony.data.DataCallResponse;

import android.telephony.data.DataProfile;
@@ -645,15 +643,6 @@ public class DataConnectionTest extends TelephonyTest { 
        mContextFixture.getCarrierConfigBundle().putStringArray(

                CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

                new String[] { "default" });

        // TODO: Remove these checks after b/176119724 is fixed.

        doReturn((int) TelephonyManager.NETWORK_TYPE_BITMASK_NR)

                .when(mPhone).getRadioAccessFamily();

        mContextFixture.getCarrierConfigBundle().putBoolean(

                CarrierConfigManager.KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, true);

        doReturn(new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_LTE,

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA))

                .when(mDisplayInfoController).getTelephonyDisplayInfo();

        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();

        testConnectEvent();



        assertFalse(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_METERED));