(cherry picked from commit
7df1a82802cdf842d07a86a80383c7d5ea7ae53a)
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
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
+ frameworks-base-testutils \
mockito-target
LOCAL_JAVA_LIBRARIES := android.test.runner
* limitations under the License.
*/
-package com.android.internal.util;
+package com.android.internal.util.test;
import android.content.ContentResolver;
import android.database.ContentObserver;
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;
android-support-test \
mockito-target
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
include $(BUILD_STATIC_JAVA_LIBRARY)
* limitations under the License.
*/
-package com.android.internal.util;
+package com.android.internal.util.test;
import android.net.Uri;
import android.os.Bundle;