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

Commit b8df76e4 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

DO NOT MERGE: Move FakeSettingsProvider to a common location. 

(cherry picked from commit 7df1a828)

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
parent 5d540d14

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



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;

tests/utils/testutils/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -27,4 +27,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android-support-test \

    mockito-target



LOCAL_JAVA_LIBRARIES := android.test.runner



include $(BUILD_STATIC_JAVA_LIBRARY)

services/tests/servicestests/src/com/android/internal/util/FakeSettingsProvider.java→tests/utils/testutils/java/com/android/internal/util/test/FakeSettingsProvider.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.net.Uri;

import android.os.Bundle;