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

Commit 40af4f3e authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix build"

parents c36bab34 46c4a32e

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

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import com.android.internal.telephony.cdma.EriInfo;

import com.android.settingslib.net.MobileDataControllerImpl;

import com.android.settingslib.net.MobileDataController;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.statusbar.policy.NetworkController.IconState;

import com.android.systemui.statusbar.policy.NetworkControllerImpl.Config;
@@ -96,7 +96,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
        mCallbackHandler = mock(CallbackHandler.class);

        mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

                mConfig, Looper.getMainLooper(), mCallbackHandler,

                mock(AccessPointControllerImpl.class), mock(MobileDataControllerImpl.class),

                mock(AccessPointControllerImpl.class), mock(MobileDataController.class),

                mMockSubDefaults);

        setupNetworkController();
@@ -137,7 +137,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
              = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

                        mConfig, Looper.getMainLooper(), mCallbackHandler,

                        mock(AccessPointControllerImpl.class),

                        mock(MobileDataControllerImpl.class), mMockSubDefaults);

                        mock(MobileDataController.class), mMockSubDefaults);



      setupNetworkController();

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

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import android.os.Looper; 
import android.telephony.TelephonyManager;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.settingslib.net.MobileDataControllerImpl;

import com.android.settingslib.net.MobileDataController;

import org.mockito.Mockito;



@SmallTest
@@ -88,7 +88,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
        mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

                mConfig, Looper.getMainLooper(), mCallbackHandler,

                Mockito.mock(AccessPointControllerImpl.class),

                Mockito.mock(MobileDataControllerImpl.class), mMockSubDefaults);

                Mockito.mock(MobileDataController.class), mMockSubDefaults);

        setupNetworkController();



        setupDefaultSignal();

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

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.test.suitebuilder.annotation.SmallTest; 


import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.settingslib.net.MobileDataControllerImpl;

import com.android.settingslib.net.MobileDataController;

import com.android.systemui.R;



import org.mockito.ArgumentCaptor;
@@ -47,7 +47,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
        // Create a new NetworkController as this is currently handled in constructor.

        mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

                mConfig, Looper.getMainLooper(), mCallbackHandler,

                mock(AccessPointControllerImpl.class), mock(MobileDataControllerImpl.class),

                mock(AccessPointControllerImpl.class), mock(MobileDataController.class),

                mMockSubDefaults);

        setupNetworkController();
@@ -96,7 +96,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
        // Create a new NetworkController as this is currently handled in constructor.

        mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,

                mConfig, Looper.getMainLooper(), mCallbackHandler,

                mock(AccessPointControllerImpl.class), mock(MobileDataControllerImpl.class),

                mock(AccessPointControllerImpl.class), mock(MobileDataController.class),

                mMockSubDefaults);

        setupNetworkController();