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

Commit e22b3e96 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary checks for testOverrideUnmetered" into sc-dev am: 966f3f61 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If77664390dbee859de1ed7db4749d29a11398213
parents 98de2fdc 966f3f61

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

+0 −11
Original line number Diff line number Diff line
@@ -55,8 +55,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;
@@ -651,15 +649,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));