From 91772021e91717048a2393471f33c6be76ece3d6 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 28 Oct 2016 12:37:38 +0900 Subject: [PATCH] Move FakeSettingsProvider to a common location. (cherry picked from commit 4163f9ca8fb2c9605b6ec0b9ef7763d6d68342fb) Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest Bug: 31479480 Change-Id: I8d4d4de2937012dd33924f53e68f96241a9b2b4f --- .../src/com/android/server/ConnectivityServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java index 794d028123..9bf3c2cf5e 100644 --- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java @@ -75,8 +75,8 @@ import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; import android.util.LogPrinter; -import com.android.internal.util.FakeSettingsProvider; import com.android.internal.util.WakeupMessage; +import com.android.internal.util.test.FakeSettingsProvider; import com.android.server.connectivity.NetworkAgentInfo; import com.android.server.connectivity.NetworkMonitor; import com.android.server.connectivity.NetworkMonitor.CaptivePortalProbeResult;