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

Commit eb5600a2 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev am: d35b6a7c 

am: 61d0fd0e

Change-Id: I42d0157d6d3d7371cb2b9fa5d18e1d3deacf2b6e
parents 211ec527 61d0fd0e

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.net.ConnectivityManager; 
import android.net.NetworkCapabilities;

import android.net.wifi.WifiManager;

import android.os.Looper;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;
@@ -105,6 +107,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 


    @Before

    public void setUp() throws Exception {

        Settings.Global.putInt(mContext.getContentResolver(), Global.AIRPLANE_MODE_ON, 0);

        mMockWm = mock(WifiManager.class);

        mMockTm = mock(TelephonyManager.class);

        mMockSm = mock(SubscriptionManager.class);