From 46c4a32ed9668294dc87c11e466f4e4b27bf48e1 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 18 Nov 2015 10:40:34 -0500 Subject: [PATCH] Fix build Change-Id: Ib784f3b8e1f8e5166128a86d07b43859ee803765 --- .../statusbar/policy/NetworkControllerBaseTest.java | 6 +++--- .../statusbar/policy/NetworkControllerDataTest.java | 4 ++-- .../statusbar/policy/NetworkControllerSignalTest.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index 1282a68b7421e..13fc47dab3d1e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -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(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index f7d326ed08848..587e2b5b988fb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -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(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index 77c5aade1bbd5..760aa9a9be640 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -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();