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

Commit 7df1a828 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Move FakeSettingsProvider to a common location. 

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: I82a1a1a7219cf1385092b84d85eddf9dda90c685
parent d28137e0

core/tests/utiltests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl 


LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    frameworks-base-testutils \

    mockito-target-minus-junit4



LOCAL_JAVA_LIBRARIES := android.test.runner

services/tests/servicestests/src/com/android/internal/util/FakeSettingsProviderTest.java→core/tests/utiltests/src/com/android/internal/util/test/FakeSettingsProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.util;

package com.android.internal.util.test;



import android.content.ContentResolver;

import android.database.ContentObserver;

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/tests/servicestests/src/com/android/server/retaildemo/PreloadAppsInstallerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import android.support.test.InstrumentationRegistry; 
import android.support.test.filters.SmallTest;

import android.test.mock.MockContentResolver;



import com.android.internal.util.FakeSettingsProvider;

import com.android.internal.util.test.FakeSettingsProvider;



import org.junit.After;

import org.junit.Before;

services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ import android.test.mock.MockContentProvider; 
import android.test.mock.MockContentResolver;

import android.util.ArrayMap;



import com.android.internal.util.FakeSettingsProvider;

import com.android.internal.util.test.FakeSettingsProvider;

import com.android.internal.widget.LockPatternUtils;

import com.android.server.SystemService;

import com.android.server.retaildemo.RetailDemoModeService.Injector;