Move libs/deviceutil to device-side/util
Test: build cts, run unit tests
bug:21762834
Change-Id: Ifd164ced7f040e312e3553f27adf59a648f463ab
diff --git a/tests/JobScheduler/Android.mk b/tests/JobScheduler/Android.mk
index 153a4fd..d907344 100755
--- a/tests/JobScheduler/Android.mk
+++ b/tests/JobScheduler/Android.mk
@@ -22,7 +22,7 @@
# When built, explicitly put it in the data partition.
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/accessibility/Android.mk b/tests/accessibility/Android.mk
index 1bcc20d..7af9d90 100644
--- a/tests/accessibility/Android.mk
+++ b/tests/accessibility/Android.mk
@@ -24,7 +24,7 @@
LOCAL_PACKAGE_NAME := CtsAccessibilityTestCases
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
index 4ce99ce..caba01c 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
@@ -19,13 +19,14 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Service;
import android.content.pm.ServiceInfo;
-import android.cts.util.PollingCheck;
import android.test.InstrumentationTestCase;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.List;
/**
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index 3949cd1..a1298cb 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -23,7 +23,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target-minus-junit4 android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ctstestserver mockito-target-minus-junit4 android-support-test
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/app/app/Android.mk b/tests/app/app/Android.mk
index abda1a2..8463a56 100644
--- a/tests/app/app/Android.mk
+++ b/tests/app/app/Android.mk
@@ -25,7 +25,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target-minus-junit4
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ctstestserver mockito-target-minus-junit4
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
src/android/app/stubs/ISecondary.aidl
diff --git a/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java b/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java
index 44ff6b2..7e8d764 100644
--- a/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java
+++ b/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java
@@ -16,9 +16,10 @@
package android.app.stubs;
-import android.cts.util.CTSResult;
import android.test.InstrumentationTestCase;
+import com.android.compatibility.common.util.CTSResult;
+
public class CTSActivityTestCaseBase extends InstrumentationTestCase implements CTSResult {
private Sync mSync;
diff --git a/tests/app/app/src/android/app/stubs/IntentServiceStub.java b/tests/app/app/src/android/app/stubs/IntentServiceStub.java
index 626e464..65e9b2a 100644
--- a/tests/app/app/src/android/app/stubs/IntentServiceStub.java
+++ b/tests/app/app/src/android/app/stubs/IntentServiceStub.java
@@ -18,10 +18,11 @@
import android.app.IntentService;
import android.content.Intent;
-import android.cts.util.PollingCheck;
import android.os.Binder;
import android.os.IBinder;
+import com.android.compatibility.common.util.PollingCheck;
+
public class IntentServiceStub extends IntentService {
public IntentServiceStub() {
super("IntentServiceStub");
diff --git a/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java b/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java
index 8e28ee4..1ab931d 100644
--- a/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java
+++ b/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java
@@ -21,10 +21,11 @@
import android.app.ActivityGroup;
import android.app.LocalActivityManager;
import android.content.Intent;
-import android.cts.util.CTSResult;
import android.os.Bundle;
import android.view.Window;
+import com.android.compatibility.common.util.CTSResult;
+
public class LocalActivityManagerTestHelper extends ActivityGroup {
public static final String ACTION_DISPATCH_RESUME = "dispatchResume";
diff --git a/tests/app/app/src/android/app/stubs/LocalForegroundService.java b/tests/app/app/src/android/app/stubs/LocalForegroundService.java
index 119b9f8..d0f63bb 100644
--- a/tests/app/app/src/android/app/stubs/LocalForegroundService.java
+++ b/tests/app/app/src/android/app/stubs/LocalForegroundService.java
@@ -20,12 +20,13 @@
import android.app.Service;
import android.content.Context;
import android.content.Intent;
-import android.cts.util.IBinderParcelable;
import android.os.Bundle;
import android.os.IBinder;
import android.util.Log;
import android.app.stubs.R;
+import com.android.compatibility.common.util.IBinderParcelable;
+
public class LocalForegroundService extends LocalService {
private static final String TAG = "LocalForegroundService";
diff --git a/tests/app/app/src/android/app/stubs/LocalService.java b/tests/app/app/src/android/app/stubs/LocalService.java
index 01e098b..f0624b2 100644
--- a/tests/app/app/src/android/app/stubs/LocalService.java
+++ b/tests/app/app/src/android/app/stubs/LocalService.java
@@ -18,12 +18,13 @@
import android.app.Service;
import android.content.Intent;
-import android.cts.util.IBinderParcelable;
import android.os.Binder;
import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
+import com.android.compatibility.common.util.IBinderParcelable;
+
public class LocalService extends Service {
public static final String SERVICE_LOCAL =
"android.app.cts.activity.SERVICE_LOCAL";
diff --git a/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java b/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java
index d6eb968..eee4f09 100644
--- a/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java
+++ b/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java
@@ -20,12 +20,13 @@
import android.app.SearchManager;
import android.content.ComponentName;
import android.content.Context;
-import android.cts.util.CTSResult;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
+import com.android.compatibility.common.util.CTSResult;
+
public class SearchManagerStubActivity extends Activity {
private static final String TAG = "SearchManagerStubActivity";
diff --git a/tests/app/src/android/app/cts/ActivityManagerTest.java b/tests/app/src/android/app/cts/ActivityManagerTest.java
index 3545f37..8c04dad 100644
--- a/tests/app/src/android/app/cts/ActivityManagerTest.java
+++ b/tests/app/src/android/app/cts/ActivityManagerTest.java
@@ -15,6 +15,8 @@
*/
package android.app.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.Manifest;
import android.app.Activity;
import android.app.ActivityManager;
@@ -40,7 +42,6 @@
import android.content.ServiceConnection;
import android.content.pm.ApplicationInfo;
import android.content.pm.ConfigurationInfo;
-import android.cts.util.SystemUtil;
import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
diff --git a/tests/app/src/android/app/cts/AlarmManagerTest.java b/tests/app/src/android/app/cts/AlarmManagerTest.java
index fabedd9..3ffb061 100644
--- a/tests/app/src/android/app/cts/AlarmManagerTest.java
+++ b/tests/app/src/android/app/cts/AlarmManagerTest.java
@@ -24,13 +24,14 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.cts.util.PollingCheck;
import android.os.Build;
import android.os.SystemClock;
import android.test.AndroidTestCase;
import android.test.MoreAsserts;
import android.util.Log;
+import com.android.compatibility.common.util.PollingCheck;
+
public class AlarmManagerTest extends AndroidTestCase {
public static final String MOCKACTION = "android.app.AlarmManagerTest.TEST_ALARMRECEIVER";
public static final String MOCKACTION2 = "android.app.AlarmManagerTest.TEST_ALARMRECEIVER2";
diff --git a/tests/app/src/android/app/cts/AlertDialogTest.java b/tests/app/src/android/app/cts/AlertDialogTest.java
index e9628a6..b633d46 100644
--- a/tests/app/src/android/app/cts/AlertDialogTest.java
+++ b/tests/app/src/android/app/cts/AlertDialogTest.java
@@ -20,12 +20,13 @@
import android.app.Instrumentation;
import android.app.stubs.DialogStubActivity;
import android.content.DialogInterface;
-import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
import android.view.KeyEvent;
import android.widget.Button;
+import com.android.compatibility.common.util.PollingCheck;
+
import android.app.stubs.R;
/*
* Test AlertDialog
diff --git a/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java b/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
index 972afe6..f18ffd4 100644
--- a/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
+++ b/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
@@ -25,7 +25,6 @@
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.DialogInterface.OnMultiChoiceClickListener;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.database.sqlite.SQLiteCursor;
import android.database.sqlite.SQLiteDatabase;
@@ -34,6 +33,8 @@
import android.test.suitebuilder.annotation.MediumTest;
import android.widget.ListView;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.File;
import static org.mockito.Mockito.*;
diff --git a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
index 710c8d6..f0ff28d 100644
--- a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
+++ b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
@@ -29,7 +29,6 @@
import android.content.DialogInterface.OnKeyListener;
import android.content.DialogInterface.OnMultiChoiceClickListener;
import android.content.res.TypedArray;
-import android.cts.util.PollingCheck;
import android.graphics.drawable.Drawable;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
@@ -43,6 +42,8 @@
import android.widget.ListView;
import org.mockito.ArgumentCaptor;
+import com.android.compatibility.common.util.PollingCheck;
+
import static org.mockito.Mockito.*;
@SmallTest
diff --git a/tests/app/src/android/app/cts/DialogTest.java b/tests/app/src/android/app/cts/DialogTest.java
index fa22ce4..42b1fed 100755
--- a/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/app/src/android/app/cts/DialogTest.java
@@ -28,7 +28,6 @@
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.content.res.TypedArray;
-import android.cts.util.PollingCheck;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.Rect;
@@ -52,6 +51,8 @@
import android.app.stubs.R;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.lang.ref.WeakReference;
public class DialogTest extends ActivityInstrumentationTestCase2<DialogStubActivity> {
diff --git a/tests/app/src/android/app/cts/DownloadManagerTest.java b/tests/app/src/android/app/cts/DownloadManagerTest.java
index 1bec983..873647f 100644
--- a/tests/app/src/android/app/cts/DownloadManagerTest.java
+++ b/tests/app/src/android/app/cts/DownloadManagerTest.java
@@ -23,7 +23,6 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
@@ -35,6 +34,7 @@
import android.webkit.cts.CtsTestServer;
import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.PollingCheck;
import java.io.File;
import java.util.Arrays;
diff --git a/tests/app/src/android/app/cts/IntentServiceTest.java b/tests/app/src/android/app/cts/IntentServiceTest.java
index 9d721fe..7df5428 100644
--- a/tests/app/src/android/app/cts/IntentServiceTest.java
+++ b/tests/app/src/android/app/cts/IntentServiceTest.java
@@ -22,9 +22,10 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
-import android.cts.util.PollingCheck;
import android.os.IBinder;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.concurrent.Callable;
public class IntentServiceTest extends ActivityTestsBase {
diff --git a/tests/app/src/android/app/cts/LocalActivityManagerTest.java b/tests/app/src/android/app/cts/LocalActivityManagerTest.java
index 7f6fd2f..71869a1 100644
--- a/tests/app/src/android/app/cts/LocalActivityManagerTest.java
+++ b/tests/app/src/android/app/cts/LocalActivityManagerTest.java
@@ -21,10 +21,11 @@
import android.app.LocalActivityManager;
import android.app.stubs.LocalActivityManagerTestHelper;
import android.content.Intent;
-import android.cts.util.CTSResult;
import android.test.InstrumentationTestCase;
import android.test.UiThreadTest;
+import com.android.compatibility.common.util.CTSResult;
+
public class LocalActivityManagerTest extends InstrumentationTestCase implements CTSResult {
private Instrumentation mInstrumentation;
diff --git a/tests/app/src/android/app/cts/ServiceTest.java b/tests/app/src/android/app/cts/ServiceTest.java
index 1d6d23d..40c323c 100644
--- a/tests/app/src/android/app/cts/ServiceTest.java
+++ b/tests/app/src/android/app/cts/ServiceTest.java
@@ -27,7 +27,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
-import android.cts.util.IBinderParcelable;
import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
@@ -38,6 +37,8 @@
import android.util.Log;
import android.app.stubs.R;
+import com.android.compatibility.common.util.IBinderParcelable;
+
public class ServiceTest extends ActivityTestsBase {
private static final String TAG = "ServiceTest";
private static final int STATE_START_1 = 0;
diff --git a/tests/backup/Android.mk b/tests/backup/Android.mk
index e64dd81..d791fa6 100644
--- a/tests/backup/Android.mk
+++ b/tests/backup/Android.mk
@@ -23,7 +23,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target-minus-junit4
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ctstestserver mockito-target-minus-junit4
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/backup/app/Android.mk b/tests/backup/app/Android.mk
index cffb1d2..8d7e3e9 100644
--- a/tests/backup/app/Android.mk
+++ b/tests/backup/app/Android.mk
@@ -28,7 +28,7 @@
LOCAL_COMPATIBILITY_SUITE := cts
LOCAL_STATIC_JAVA_LIBRARIES := \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk
index 7f168f9..200574e 100644
--- a/tests/camera/Android.mk
+++ b/tests/camera/Android.mk
@@ -23,7 +23,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil \
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util \
ctstestrunner \
mockito-target-minus-junit4 \
android-ex-camera2
diff --git a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
index d466662..9302049 100644
--- a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
@@ -14,7 +14,6 @@
import static android.hardware.camera2.cts.CameraTestUtils.*;
import static com.android.ex.camera2.blocking.BlockingSessionCallback.*;
-import android.cts.util.MediaUtils;
import android.graphics.ImageFormat;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CameraCaptureSession;
@@ -43,6 +42,7 @@
import android.util.Range;
import android.view.Surface;
+import com.android.compatibility.common.util.MediaUtils;
import com.android.ex.camera2.blocking.BlockingSessionCallback;
import junit.framework.AssertionFailedError;
diff --git a/tests/camera/src/android/hardware/cts/Camera_SizeTest.java b/tests/camera/src/android/hardware/cts/Camera_SizeTest.java
index 2f9c94b..77e75dd 100644
--- a/tests/camera/src/android/hardware/cts/Camera_SizeTest.java
+++ b/tests/camera/src/android/hardware/cts/Camera_SizeTest.java
@@ -16,14 +16,14 @@
package android.hardware.cts;
-
-import android.cts.util.CtsAndroidTestCase;
import android.hardware.Camera;
import android.hardware.Camera.Parameters;
import android.hardware.cts.helpers.CameraUtils;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
import junit.framework.Test;
import junit.framework.TestSuite;
diff --git a/tests/dram/Android.mk b/tests/dram/Android.mk
index 8997003..e286e8d 100644
--- a/tests/dram/Android.mk
+++ b/tests/dram/Android.mk
@@ -21,7 +21,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_JNI_SHARED_LIBRARIES := libctsdram_jni
diff --git a/tests/dram/src/android/dram/cts/BandwidthTest.java b/tests/dram/src/android/dram/cts/BandwidthTest.java
index fe7e248..8b54d90 100644
--- a/tests/dram/src/android/dram/cts/BandwidthTest.java
+++ b/tests/dram/src/android/dram/cts/BandwidthTest.java
@@ -17,11 +17,11 @@
package android.dram.cts;
import android.content.Context;
-import android.cts.util.CtsAndroidTestCase;
import android.graphics.Point;
import android.util.Log;
import android.view.WindowManager;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/filesystem/Android.mk b/tests/filesystem/Android.mk
index bf88148..417d7c4 100644
--- a/tests/filesystem/Android.mk
+++ b/tests/filesystem/Android.mk
@@ -18,7 +18,7 @@
# don't include this package in any target
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java b/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
index 11b150e..3ae2408 100644
--- a/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
+++ b/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
@@ -18,10 +18,10 @@
import android.util.Log;
-import android.cts.util.CtsAndroidTestCase;
-import android.cts.util.SystemUtil;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.SystemUtil;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/tests/filesystem/src/android/filesystem/cts/FileUtil.java b/tests/filesystem/src/android/filesystem/cts/FileUtil.java
index 8149105..4cf07ac 100755
--- a/tests/filesystem/src/android/filesystem/cts/FileUtil.java
+++ b/tests/filesystem/src/android/filesystem/cts/FileUtil.java
@@ -17,7 +17,6 @@
package android.filesystem.cts;
import android.content.Context;
-import android.cts.util.SystemUtil;
import android.util.Log;
import com.android.compatibility.common.util.DeviceReportLog;
@@ -27,6 +26,7 @@
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
import com.android.compatibility.common.util.Stat;
+import com.android.compatibility.common.util.SystemUtil;
import java.io.BufferedReader;
import java.io.File;
diff --git a/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java b/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java
index 7b97f8f..f9abebb 100644
--- a/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java
+++ b/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java
@@ -16,9 +16,10 @@
package android.filesystem.cts;
-import android.cts.util.CtsAndroidTestCase;
import android.os.Environment;
+
import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
public class RandomRWTest extends CtsAndroidTestCase {
diff --git a/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java b/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java
index 2db2f24..aabc825 100644
--- a/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java
+++ b/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java
@@ -16,7 +16,7 @@
package android.filesystem.cts;
-import android.cts.util.CtsAndroidTestCase;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.MeasureRun;
diff --git a/tests/fragment/Android.mk b/tests/fragment/Android.mk
index ab76caf..053e668 100644
--- a/tests/fragment/Android.mk
+++ b/tests/fragment/Android.mk
@@ -32,7 +32,7 @@
android-support-test \
mockito-target-minus-junit4 \
android-common \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
platform-test-annotations
#LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test
diff --git a/tests/fragment/src/android/fragment/cts/FragmentTransitionTest.java b/tests/fragment/src/android/fragment/cts/FragmentTransitionTest.java
index 5e66722..8f3f55b 100644
--- a/tests/fragment/src/android/fragment/cts/FragmentTransitionTest.java
+++ b/tests/fragment/src/android/fragment/cts/FragmentTransitionTest.java
@@ -23,13 +23,14 @@
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
+import com.android.compatibility.common.util.transition.TargetTracking;
+import com.android.compatibility.common.util.transition.TrackingTransition;
+
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.app.Instrumentation;
import android.app.SharedElementCallback;
-import android.cts.util.transition.TargetTracking;
-import android.cts.util.transition.TrackingTransition;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.test.InstrumentationRegistry;
diff --git a/tests/fragment/src/android/fragment/cts/TransitionFragment.java b/tests/fragment/src/android/fragment/cts/TransitionFragment.java
index 6513691..fbe2250 100644
--- a/tests/fragment/src/android/fragment/cts/TransitionFragment.java
+++ b/tests/fragment/src/android/fragment/cts/TransitionFragment.java
@@ -15,7 +15,7 @@
*/
package android.fragment.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
@@ -23,8 +23,9 @@
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
-import android.cts.util.transition.TrackingTransition;
-import android.cts.util.transition.TrackingVisibility;
+import com.android.compatibility.common.util.transition.TrackingTransition;
+import com.android.compatibility.common.util.transition.TrackingVisibility;
+
import android.os.Bundle;
import android.os.SystemClock;
import android.transition.Transition;
diff --git a/tests/jank/Android.mk b/tests/jank/Android.mk
index 6d85c70..fe3644a 100644
--- a/tests/jank/Android.mk
+++ b/tests/jank/Android.mk
@@ -27,6 +27,6 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner ub-uiautomator ub-janktesthelper
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ub-uiautomator ub-janktesthelper
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/leanbackjank/Android.mk b/tests/leanbackjank/Android.mk
index e2c2593..b24b1da 100644
--- a/tests/leanbackjank/Android.mk
+++ b/tests/leanbackjank/Android.mk
@@ -29,7 +29,7 @@
LOCAL_COMPATIBILITY_SUITE := cts
LOCAL_STATIC_JAVA_LIBRARIES := \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
ub-uiautomator \
ub-janktesthelper \
diff --git a/tests/leanbackjank/app/Android.mk b/tests/leanbackjank/app/Android.mk
index e2cbf89..0328fdf 100644
--- a/tests/leanbackjank/app/Android.mk
+++ b/tests/leanbackjank/app/Android.mk
@@ -33,7 +33,7 @@
$(LOCAL_PATH)/res
LOCAL_STATIC_JAVA_LIBRARIES := \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
ub-uiautomator \
ub-janktesthelper \
diff --git a/tests/openglperf2/Android.mk b/tests/openglperf2/Android.mk
index f4295ca..f46c7d4 100644
--- a/tests/openglperf2/Android.mk
+++ b/tests/openglperf2/Android.mk
@@ -21,7 +21,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_JNI_SHARED_LIBRARIES := libctsopengl_jni
diff --git a/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java b/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java
index 6558786..420b7f9 100644
--- a/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java
+++ b/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java
@@ -13,9 +13,10 @@
*/
package android.opengl2.cts.primitive;
+import com.android.compatibility.common.util.WatchDog;
+
import android.app.Activity;
import android.content.Intent;
-import android.cts.util.WatchDog;
import android.opengl2.cts.GLActivityIntentKeys;
import android.os.Bundle;
import android.util.Log;
diff --git a/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java b/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java
index 0bfb38b..d018c06 100644
--- a/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java
+++ b/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java
@@ -13,10 +13,11 @@
*/
package android.opengl2.cts.reference;
+import com.android.compatibility.common.util.WatchDog;
+
import android.app.Activity;
import android.content.Intent;
import android.content.res.AssetManager;
-import android.cts.util.WatchDog;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.opengl.GLES20;
diff --git a/tests/sensor/Android.mk b/tests/sensor/Android.mk
index b31abd5..d3e7ce2 100644
--- a/tests/sensor/Android.mk
+++ b/tests/sensor/Android.mk
@@ -23,7 +23,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util
LOCAL_JAVA_LIBRARIES := platform-test-annotations
diff --git a/tests/simplecpu/Android.mk b/tests/simplecpu/Android.mk
index 7183b2c..cb13016 100644
--- a/tests/simplecpu/Android.mk
+++ b/tests/simplecpu/Android.mk
@@ -21,7 +21,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_JNI_SHARED_LIBRARIES := libctscpu_jni
diff --git a/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java b/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java
index 9f72d31..3e60b6d 100644
--- a/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java
+++ b/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java
@@ -16,9 +16,9 @@
package android.simplecpu.cts;
-import android.cts.util.CtsAndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/systemAppTest/test/Android.mk b/tests/systemAppTest/test/Android.mk
index 9be491c..e15d259 100644
--- a/tests/systemAppTest/test/Android.mk
+++ b/tests/systemAppTest/test/Android.mk
@@ -24,7 +24,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_APPS_PRIVILEGED)
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/alarmclock/Android.mk b/tests/tests/alarmclock/Android.mk
index 77cb183..6c74c5c 100644
--- a/tests/tests/alarmclock/Android.mk
+++ b/tests/tests/alarmclock/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/alarmclock/service/Android.mk b/tests/tests/alarmclock/service/Android.mk
index 8f0b185..14fdd5d 100644
--- a/tests/tests/alarmclock/service/Android.mk
+++ b/tests/tests/alarmclock/service/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/animation/Android.mk b/tests/tests/animation/Android.mk
index fc741c8..2aeac88 100644
--- a/tests/tests/animation/Android.mk
+++ b/tests/tests/animation/Android.mk
@@ -28,7 +28,7 @@
android-support-test \
mockito-target-minus-junit4 \
android-common \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
platform-test-annotations
diff --git a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
index 16a517f..4939f3f 100644
--- a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
@@ -16,7 +16,7 @@
package android.animation.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java b/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
index 11bb749..3cbbbb2 100644
--- a/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
+++ b/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
@@ -15,7 +15,7 @@
*/
package android.animation.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
index 9392673..605e1c1 100644
--- a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
@@ -15,7 +15,7 @@
*/
package android.animation.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/tests/tests/assist/Android.mk b/tests/tests/assist/Android.mk
index 61379c5..9b7d774 100644
--- a/tests/tests/assist/Android.mk
+++ b/tests/tests/assist/Android.mk
@@ -24,7 +24,7 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/assist/service/Android.mk b/tests/tests/assist/service/Android.mk
index 2f72853..9b9ed84 100644
--- a/tests/tests/assist/service/Android.mk
+++ b/tests/tests/assist/service/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/assist/src/android/assist/cts/AssistTestBase.java b/tests/tests/assist/src/android/assist/cts/AssistTestBase.java
index 05d655a..cce36b9 100644
--- a/tests/tests/assist/src/android/assist/cts/AssistTestBase.java
+++ b/tests/tests/assist/src/android/assist/cts/AssistTestBase.java
@@ -16,6 +16,8 @@
package android.assist.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.assist.cts.TestStartActivity;
import android.assist.common.Utils;
@@ -31,7 +33,6 @@
import android.content.IntentFilter;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
-import android.cts.util.SystemUtil;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
diff --git a/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java b/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java
index c6ac3a6..d7e037c 100644
--- a/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java
+++ b/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java
@@ -16,6 +16,8 @@
package android.assist.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.assist.cts.TestStartActivity;
import android.assist.common.Utils;
@@ -27,7 +29,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.cts.util.SystemUtil;
import android.graphics.Point;
import android.os.Bundle;
import android.provider.Settings;
diff --git a/tests/tests/assist/src/android/assist/cts/DisableContextTest.java b/tests/tests/assist/src/android/assist/cts/DisableContextTest.java
index ea4cd3d..368e47d 100644
--- a/tests/tests/assist/src/android/assist/cts/DisableContextTest.java
+++ b/tests/tests/assist/src/android/assist/cts/DisableContextTest.java
@@ -16,6 +16,8 @@
package android.assist.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.assist.common.Utils;
import android.app.Activity;
@@ -26,7 +28,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.cts.util.SystemUtil;
import android.os.Bundle;
import android.provider.Settings;
import android.test.ActivityInstrumentationTestCase2;
diff --git a/tests/tests/assist/src/android/assist/cts/LifecycleTest.java b/tests/tests/assist/src/android/assist/cts/LifecycleTest.java
index 3ed26d1..9f095aa 100644
--- a/tests/tests/assist/src/android/assist/cts/LifecycleTest.java
+++ b/tests/tests/assist/src/android/assist/cts/LifecycleTest.java
@@ -16,6 +16,8 @@
package android.assist.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.assist.cts.TestStartActivity;
import android.assist.common.Utils;
@@ -27,7 +29,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.cts.util.SystemUtil;
import android.os.Bundle;
import android.provider.Settings;
import android.test.ActivityInstrumentationTestCase2;
diff --git a/tests/tests/carrierapi/Android.mk b/tests/tests/carrierapi/Android.mk
index 53e051f..4cb2c38 100644
--- a/tests/tests/carrierapi/Android.mk
+++ b/tests/tests/carrierapi/Android.mk
@@ -22,7 +22,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk
index 9e69677..67fc3fa 100644
--- a/tests/tests/content/Android.mk
+++ b/tests/tests/content/Android.mk
@@ -25,12 +25,12 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 \
android-support-multidex \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
services.core
# Use multi-dex as the compatibility-common-util-devicesidelib dependency
-# on ctsdeviceutil pushes us beyond 64k methods.
+# on compatibility-device-util pushes us beyond 64k methods.
LOCAL_JACK_FLAGS := --multi-dex legacy
# Resource unit tests use a private locale and some densities
diff --git a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
index ca6bba7..961b784 100644
--- a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
+++ b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
@@ -18,10 +18,10 @@
import android.content.ClipData;
import android.content.ClipboardManager.OnPrimaryClipChangedListener;
-import android.cts.util.PollingCheck;
import android.net.Uri;
import android.test.ActivityInstrumentationTestCase2;
+import com.android.compatibility.common.util.PollingCheck;
public class ClipboardManagerListenerTest
extends ActivityInstrumentationTestCase2<ClipboardManagerListenerActivity> {
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index 527a9ec..9c0c0d3 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import android.content.cts.R;
import android.content.res.AssetFileDescriptor;
-import android.cts.util.PollingCheck;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.sqlite.SQLiteQueryBuilder;
@@ -36,6 +35,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
index 4ffe490..5f48260 100644
--- a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
@@ -29,7 +29,6 @@
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.database.sqlite.SQLiteCursorDriver;
import android.database.sqlite.SQLiteDatabase;
@@ -45,6 +44,8 @@
import android.test.AndroidTestCase;
import android.view.WindowManager;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
diff --git a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
index e11beec..48649b1 100644
--- a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
@@ -20,7 +20,6 @@
import android.content.pm.ComponentInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.cts.util.WidgetTestUtils;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Parcel;
@@ -28,6 +27,8 @@
import android.util.Printer;
import android.util.StringBuilderPrinter;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import android.content.cts.R;
diff --git a/tests/tests/drm/Android.mk b/tests/tests/drm/Android.mk
index 210be2c..d67c048 100644
--- a/tests/tests/drm/Android.mk
+++ b/tests/tests/drm/Android.mk
@@ -24,7 +24,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/drm/src/android/drm/cts/DRMTest.java b/tests/tests/drm/src/android/drm/cts/DRMTest.java
index 190d782..e632842 100644
--- a/tests/tests/drm/src/android/drm/cts/DRMTest.java
+++ b/tests/tests/drm/src/android/drm/cts/DRMTest.java
@@ -16,11 +16,11 @@
package android.drm.cts;
+import com.android.compatibility.common.util.MediaUtils;
import android.content.ContentValues;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
-import android.cts.util.MediaUtils;
import android.test.AndroidTestCase;
import android.util.Log;
import java.io.IOException;
diff --git a/tests/tests/externalservice/Android.mk b/tests/tests/externalservice/Android.mk
index 3208177..14e82c5 100644
--- a/tests/tests/externalservice/Android.mk
+++ b/tests/tests/externalservice/Android.mk
@@ -25,7 +25,7 @@
LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/externalservice/service/Android.mk b/tests/tests/externalservice/service/Android.mk
index 9541b0e..e99a71d 100644
--- a/tests/tests/externalservice/service/Android.mk
+++ b/tests/tests/externalservice/service/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk
index f6a6e8a..ee3b453 100644
--- a/tests/tests/graphics/Android.mk
+++ b/tests/tests/graphics/Android.mk
@@ -25,7 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
mockito-target-minus-junit4 \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
android-support-annotations
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
index f0e5c07..38f7d83 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
@@ -23,7 +23,6 @@
import static org.junit.Assert.fail;
import android.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.Bitmap.Config;
@@ -38,6 +37,8 @@
import android.support.test.runner.AndroidJUnit4;
import android.util.DisplayMetrics;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/graphics/src/android/graphics/cts/CameraTest.java b/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
index ff2fd6f..8991e0d 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
@@ -18,13 +18,14 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import android.cts.util.CtsArrayUtils;
import android.graphics.Camera;
import android.graphics.Canvas;
import android.graphics.Matrix;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+import com.android.compatibility.common.util.CtsArrayUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
index 430a50a..1a3bd3d 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertTrue;
import android.content.res.Resources;
-import android.cts.util.CtsArrayUtils;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.BitmapFactory;
@@ -48,6 +47,8 @@
import android.text.SpannedString;
import android.util.DisplayMetrics;
+import com.android.compatibility.common.util.CtsArrayUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
index 62ec342..4a7909c 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
@@ -17,11 +17,12 @@
import static org.junit.Assert.assertEquals;
-import android.cts.util.CtsArrayUtils;
import android.graphics.ColorMatrix;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+import com.android.compatibility.common.util.CtsArrayUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java b/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
index 59e60cc..01dc1e9 100644
--- a/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
@@ -22,13 +22,14 @@
import junit.framework.TestCase;
-import android.cts.util.CtsArrayUtils;
import android.graphics.Interpolator;
import android.graphics.Interpolator.Result;
import android.os.SystemClock;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+import com.android.compatibility.common.util.CtsArrayUtils;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
index 97083a7..5f78c6c 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import android.cts.util.CtsArrayUtils;
import android.graphics.Camera;
import android.graphics.Matrix;
import android.graphics.Matrix.ScaleToFit;
@@ -29,6 +28,8 @@
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+import com.android.compatibility.common.util.CtsArrayUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
index 910af2c..f5c7aa3 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Canvas;
import android.graphics.Movie;
import android.graphics.Paint;
@@ -32,6 +31,8 @@
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -152,4 +153,4 @@
int scaledWidth = WidgetTestUtils.convertDipToPixels(mContext, mMovie.width());
assertEquals(expectedWidth, scaledWidth);
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableParameterizedTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableParameterizedTest.java
index b018729..c52cd25 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableParameterizedTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableParameterizedTest.java
@@ -16,9 +16,10 @@
package android.graphics.drawable.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.app.Activity;
import android.content.res.Resources;
-import android.cts.util.SystemUtil;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
index 26086b4..7b3cab9 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
@@ -27,7 +27,6 @@
import android.app.Activity;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
-import android.cts.util.PollingCheck;
import android.graphics.cts.ImageViewCtsActivity;
import android.graphics.cts.R;
import android.graphics.drawable.AnimationDrawable;
@@ -40,6 +39,8 @@
import android.util.Xml;
import android.widget.ImageView;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/hardware/Android.mk b/tests/tests/hardware/Android.mk
index 42b3bdf..723a3f8 100644
--- a/tests/tests/hardware/Android.mk
+++ b/tests/tests/hardware/Android.mk
@@ -26,7 +26,6 @@
LOCAL_COMPATIBILITY_SUITE := cts
LOCAL_STATIC_JAVA_LIBRARIES := \
- ctsdeviceutil \
compatibility-device-util \
ctstestrunner \
mockito-target-minus-junit4 \
diff --git a/tests/tests/keystore/Android.mk b/tests/tests/keystore/Android.mk
index 8fe7a3b..68828ac 100644
--- a/tests/tests/keystore/Android.mk
+++ b/tests/tests/keystore/Android.mk
@@ -28,7 +28,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
core-tests-support \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
guava
diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk
index 6a8b9d3..bfd9a08 100644
--- a/tests/tests/location/Android.mk
+++ b/tests/tests/location/Android.mk
@@ -27,7 +27,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_STATIC_JAVA_LIBRARIES := \
- ctsdeviceutil ctstestrunner
+ compatibility-device-util ctstestrunner
LOCAL_SDK_VERSION := test_current
@@ -47,7 +47,7 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java b/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java
index 14019be..7b08da8 100644
--- a/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java
+++ b/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java
@@ -16,7 +16,8 @@
package android.location.cts;
-import android.cts.util.LocationUtils;
+import com.android.compatibility.common.util.LocationUtils;
+
import android.test.InstrumentationTestCase;
/**
diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk
index d61556d..1886093 100644
--- a/tests/tests/media/Android.mk
+++ b/tests/tests/media/Android.mk
@@ -44,7 +44,7 @@
# include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctsmediautil ctsdeviceutil compatibility-device-util ctstestserver ctstestrunner ndkaudio android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctsmediautil compatibility-device-util ctstestserver ctstestrunner ndkaudio android-support-test
LOCAL_JNI_SHARED_LIBRARIES := libctsmediacodec_jni libaudio_jni libnativehelper_compat_libc++ libndkaudioLib
diff --git a/tests/tests/media/src/android/media/cts/AudioAttributesTest.java b/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
index 99ab1ab..58f5313 100644
--- a/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
@@ -16,10 +16,11 @@
package android.media.cts;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioAttributes;
import android.os.Parcel;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
public class AudioAttributesTest extends CtsAndroidTestCase {
// -----------------------------------------------------------------
diff --git a/tests/tests/media/src/android/media/cts/AudioFormatTest.java b/tests/tests/media/src/android/media/cts/AudioFormatTest.java
index 100e3b4..e37f64e 100644
--- a/tests/tests/media/src/android/media/cts/AudioFormatTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioFormatTest.java
@@ -16,10 +16,11 @@
package android.media.cts;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioFormat;
import android.os.Parcel;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
public class AudioFormatTest extends CtsAndroidTestCase {
// -----------------------------------------------------------------
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerStub.java b/tests/tests/media/src/android/media/cts/AudioManagerStub.java
index 50fb2fd..9e0c74c 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerStub.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerStub.java
@@ -19,7 +19,6 @@
import android.media.cts.R;
import android.app.Activity;
-import android.cts.util.CTSResult;
import android.content.Context;
import android.content.Intent;
import android.media.AudioManager;
@@ -27,6 +26,8 @@
import android.media.MediaPlayer;
import android.os.Bundle;
+import com.android.compatibility.common.util.CTSResult;
+
public class AudioManagerStub extends Activity {
private final int MP3_TO_PLAY = R.raw.testmp3;
private MediaPlayer mMediaPlayer;
diff --git a/tests/tests/media/src/android/media/cts/AudioNativeTest.java b/tests/tests/media/src/android/media/cts/AudioNativeTest.java
index 7301cc7..c4861ad 100644
--- a/tests/tests/media/src/android/media/cts/AudioNativeTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioNativeTest.java
@@ -19,10 +19,11 @@
import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioDeviceInfo;
import android.media.AudioManager;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
public class AudioNativeTest extends CtsAndroidTestCase {
public static final int MAX_CHANNEL_COUNT = 2;
public static final int MAX_INDEX_MASK = (1 << MAX_CHANNEL_COUNT) - 1;
diff --git a/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java b/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java
index 6156095..a05698d 100644
--- a/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java
+++ b/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java
@@ -19,13 +19,13 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.content.Context;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioDeviceInfo;
import android.media.AudioManager;
import android.media.AudioRouting;
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.ndkaudio.AudioPlayer;
import java.lang.annotation.Retention;
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordNative.java b/tests/tests/media/src/android/media/cts/AudioRecordNative.java
index 3c7632e..d6e8f6d 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordNative.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordNative.java
@@ -18,9 +18,10 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
-import android.cts.util.CtsAndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordTest.java b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
index b1455bd..78a13a0 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
@@ -19,7 +19,6 @@
import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.AudioRecord;
@@ -34,6 +33,7 @@
import android.os.SystemClock;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
index 1de6302..665bfa1 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
@@ -17,13 +17,14 @@
package android.media.cts;
import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
import android.media.AudioFormat;
import android.media.AudioRecord;
import android.media.MediaRecorder.AudioSource;
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java b/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
index 7c1bb37..e42f4e2 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
@@ -17,7 +17,6 @@
package android.media.cts;
import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioDeviceInfo;
import android.media.AudioFormat;
import android.media.AudioManager;
@@ -28,6 +27,8 @@
import android.os.Parcel;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java b/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java
index cf1a406..f82e1c5 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java
@@ -19,7 +19,6 @@
import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioAttributes;
import android.media.AudioFormat;
import android.media.AudioManager;
@@ -28,6 +27,8 @@
import android.media.PlaybackParams;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.ShortBuffer;
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackNative.java b/tests/tests/media/src/android/media/cts/AudioTrackNative.java
index 54746ae..065dd3a 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackNative.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackNative.java
@@ -18,9 +18,10 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
-import android.cts.util.CtsAndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java b/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java
index a1a2f3a..7c81816 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java
@@ -22,7 +22,6 @@
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioAttributes;
import android.media.AudioDeviceInfo;
import android.media.AudioFormat;
@@ -31,6 +30,8 @@
import android.media.AudioTrack;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.util.ArrayList;
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackTest.java b/tests/tests/media/src/android/media/cts/AudioTrackTest.java
index ad103bd..13484b2 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackTest.java
@@ -19,7 +19,6 @@
import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioAttributes;
import android.media.AudioFormat;
import android.media.AudioManager;
@@ -28,6 +27,7 @@
import android.media.PlaybackParams;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java b/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java
index 971bfb3..04666f4 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java
@@ -16,7 +16,6 @@
package android.media.cts;
-import android.cts.util.CtsAndroidTestCase;
import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.AudioTrack;
@@ -25,6 +24,7 @@
import android.os.Looper;
import android.os.Message;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java b/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java
index 9b1dc81..bbbbb3f 100644
--- a/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java
+++ b/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java
@@ -19,13 +19,14 @@
import android.annotation.TargetApi;
import android.content.Context;
-import android.cts.util.MediaUtils;
import android.graphics.Bitmap;
import android.media.MediaFormat;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.view.View;
+import com.android.compatibility.common.util.MediaUtils;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
index 5600312..ead1201 100644
--- a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.MediaUtils;
import android.media.cts.CodecUtils;
import android.media.Image;
import android.media.MediaCodec;
@@ -32,6 +31,7 @@
import android.util.Range;
import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.MediaUtils;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
import com.android.compatibility.common.util.Stat;
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java
index 3025306..08d8d74 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -22,7 +22,6 @@
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.MediaUtils;
import android.graphics.ImageFormat;
import android.media.cts.CodecUtils;
import android.media.Image;
@@ -39,6 +38,7 @@
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java b/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
index 131cb55..997967c 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
@@ -21,7 +21,6 @@
import android.app.Instrumentation;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.CtsAndroidTestCase;
import android.media.cts.DecoderTest.AudioParameter;
import android.media.MediaCodec;
import android.media.MediaCodecInfo;
@@ -31,6 +30,8 @@
import android.support.test.InstrumentationRegistry;
import android.util.Log;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
index 0b0ac7b..2fc04f2 100755
--- a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
@@ -16,7 +16,6 @@
package android.media.cts;
-import android.cts.util.MediaUtils;
import android.graphics.ImageFormat;
import android.media.Image;
import android.media.MediaCodec;
@@ -29,6 +28,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/tests/tests/media/src/android/media/cts/EncoderTest.java b/tests/tests/media/src/android/media/cts/EncoderTest.java
index e086347..cf2e8f6 100644
--- a/tests/tests/media/src/android/media/cts/EncoderTest.java
+++ b/tests/tests/media/src/android/media/cts/EncoderTest.java
@@ -19,7 +19,6 @@
import android.media.cts.R;
import android.content.Context;
-import android.cts.util.MediaUtils;
import android.media.MediaCodec;
import android.media.MediaCodecInfo;
import android.media.MediaCodecList;
@@ -28,6 +27,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.File;
import java.io.InputStream;
import java.nio.BufferOverflowException;
diff --git a/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java b/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
index f1b2972..dcac8f0 100644
--- a/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
@@ -22,7 +22,6 @@
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
-import android.cts.util.MediaUtils;
import android.graphics.Rect;
import android.graphics.ImageFormat;
import android.media.cts.CodecUtils;
@@ -45,6 +44,8 @@
import static android.media.MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Flexible;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
diff --git a/tests/tests/media/src/android/media/cts/MediaBrowserTest.java b/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
index 56e2a6f..75fc1dd 100644
--- a/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
@@ -16,12 +16,13 @@
package android.media.cts;
import android.content.ComponentName;
-import android.cts.util.PollingCheck;
import android.media.browse.MediaBrowser;
import android.media.browse.MediaBrowser.MediaItem;
import android.os.Bundle;
import android.test.InstrumentationTestCase;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
index 3c751a5..557e41c 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
@@ -16,7 +16,6 @@
package android.media.cts;
import android.content.pm.PackageManager;
-import android.cts.util.MediaUtils;
import android.media.MediaCodec;
import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.AudioCapabilities;
@@ -37,6 +36,7 @@
import android.util.Log;
import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
import java.io.IOException;
import java.util.HashSet;
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecTest.java b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
index f9b3b5a..c19523b 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
@@ -19,7 +19,6 @@
import android.media.cts.R;
import android.content.res.AssetFileDescriptor;
-import android.cts.util.MediaUtils;
import android.media.MediaCodec;
import android.media.MediaCodec.BufferInfo;
import android.media.MediaCodec.CodecException;
@@ -40,6 +39,8 @@
import android.util.Log;
import android.view.Surface;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
diff --git a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
index fd49fdf..22f2481 100644
--- a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
@@ -20,7 +20,6 @@
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.MediaUtils;
import android.media.MediaDataSource;
import android.media.MediaMetadataRetriever;
import android.graphics.Bitmap;
@@ -29,6 +28,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.MediaUtils;
+
import static android.media.MediaMetadataRetriever.OPTION_CLOSEST;
import static android.media.MediaMetadataRetriever.OPTION_CLOSEST_SYNC;
import static android.media.MediaMetadataRetriever.OPTION_NEXT_SYNC;
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
index 30d0feb..5fc71ff 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
@@ -15,7 +15,6 @@
*/
package android.media.cts;
-import android.cts.util.MediaUtils;
import android.media.MediaPlayer;
import android.os.Handler;
import android.os.Looper;
@@ -23,6 +22,8 @@
import android.os.SystemClock;
import android.webkit.cts.CtsTestServer;
+import com.android.compatibility.common.util.MediaUtils;
+
import org.apache.http.HttpServerConnection;
import org.apache.http.impl.DefaultHttpServerConnection;
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index f611767..2cf5443 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
-import android.cts.util.MediaUtils;
import android.graphics.Rect;
import android.hardware.Camera;
import android.media.AudioManager;
@@ -49,6 +48,8 @@
import android.platform.test.annotations.RequiresDevice;
import android.util.Log;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStream;
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
index 95cb43c..ec3b442 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
@@ -19,10 +19,11 @@
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.MediaUtils;
import android.media.MediaPlayer;
import android.test.ActivityInstrumentationTestCase2;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.IOException;
import java.util.logging.Logger;
diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index 6247333..700ecfd 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -16,7 +16,6 @@
package android.media.cts;
import android.content.pm.PackageManager;
-import android.cts.util.MediaUtils;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
@@ -41,6 +40,8 @@
import android.util.Log;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
index 952e03f..2bd699f 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
@@ -21,14 +21,15 @@
import android.content.ComponentName;
import android.content.Context;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.PollingCheck;
import android.media.MediaScannerConnection;
import android.media.MediaScannerConnection.MediaScannerConnectionClient;
import android.net.Uri;
import android.os.IBinder;
import android.test.AndroidTestCase;
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerTest.java b/tests/tests/media/src/android/media/cts/MediaScannerTest.java
index a27be8f..3a12e3b 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerTest.java
@@ -26,8 +26,6 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.AssetFileDescriptor;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.media.MediaMetadataRetriever;
import android.media.MediaScannerConnection;
@@ -44,6 +42,9 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.File;
import java.io.IOException;
diff --git a/tests/tests/media/src/android/media/cts/MediaSyncTest.java b/tests/tests/media/src/android/media/cts/MediaSyncTest.java
index 08dc5ea..2adede1 100644
--- a/tests/tests/media/src/android/media/cts/MediaSyncTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaSyncTest.java
@@ -21,7 +21,6 @@
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.MediaUtils;
import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.AudioTrack;
@@ -41,6 +40,8 @@
import android.view.Surface;
import android.view.SurfaceHolder;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.IOException;
import java.lang.Long;
import java.lang.Math;
diff --git a/tests/tests/media/src/android/media/cts/MidiSoloTest.java b/tests/tests/media/src/android/media/cts/MidiSoloTest.java
index d198ee8..b133ed9 100644
--- a/tests/tests/media/src/android/media/cts/MidiSoloTest.java
+++ b/tests/tests/media/src/android/media/cts/MidiSoloTest.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
import android.media.midi.MidiDevice;
import android.media.midi.MidiDevice.MidiConnection;
import android.media.midi.MidiDeviceInfo;
@@ -33,6 +32,8 @@
import android.os.Handler;
import android.os.Looper;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
/**
* Test MIDI when there may be no MIDI devices available. There is not much we
* can test without a device.
diff --git a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
index 0806571..32cf661 100644
--- a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
@@ -20,7 +20,6 @@
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.MediaUtils;
import android.media.MediaCodec;
import android.media.MediaCodec.BufferInfo;
import android.media.MediaCodecInfo;
@@ -35,6 +34,8 @@
import android.view.Surface;
import android.webkit.cts.CtsTestServer;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
index 0db2e05..1076b8e 100644
--- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
@@ -15,7 +15,6 @@
*/
package android.media.cts;
-import android.cts.util.MediaUtils;
import android.media.MediaFormat;
import android.media.MediaPlayer;
import android.media.MediaPlayer.TrackInfo;
@@ -27,6 +26,7 @@
import android.webkit.cts.CtsTestServer;
import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
index c6e0578..c7101b5 100644
--- a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
@@ -21,8 +21,6 @@
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
-import android.cts.util.MediaPerfUtils;
-import android.cts.util.MediaUtils;
import android.media.MediaCodec;
import android.media.MediaCodecInfo.VideoCapabilities;
import android.media.MediaExtractor;
@@ -32,6 +30,8 @@
import android.view.Surface;
import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.MediaPerfUtils;
+import com.android.compatibility.common.util.MediaUtils;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/tests/media/src/android/media/cts/VideoEncoderTest.java b/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
index 16fe0a1..acf7dac 100644
--- a/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
@@ -20,7 +20,6 @@
import android.media.cts.CodecUtils;
-import android.cts.util.MediaUtils;
import android.graphics.ImageFormat;
import android.graphics.SurfaceTexture;
import android.media.Image;
@@ -40,6 +39,8 @@
import android.util.Size;
import android.view.Surface;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/tests/tests/mediastress/Android.mk b/tests/tests/mediastress/Android.mk
index 4cbc4cc..34bc778 100644
--- a/tests/tests/mediastress/Android.mk
+++ b/tests/tests/mediastress/Android.mk
@@ -26,7 +26,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil compatibility-device-util
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_HOST_SHARED_LIBRARIES := compatibility-device-media-preconditions
diff --git a/tests/tests/mediastress/preconditions/app/Android.mk b/tests/tests/mediastress/preconditions/app/Android.mk
index b8aa32a..0ef2de4 100644
--- a/tests/tests/mediastress/preconditions/app/Android.mk
+++ b/tests/tests/mediastress/preconditions/app/Android.mk
@@ -27,7 +27,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util
# tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java b/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
index 9830cff..1b55196 100644
--- a/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
+++ b/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
@@ -16,9 +16,9 @@
package android.mediastress.cts.preconditions.app;
import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
import android.app.Instrumentation;
-import android.cts.util.MediaUtils;
import android.media.MediaFormat;
import android.os.Bundle;
import android.support.test.InstrumentationRegistry;
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
index 400aedf..d5d01c8 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
@@ -17,11 +17,11 @@
package android.mediastress.cts;
import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Intent;
-import android.cts.util.MediaUtils;
import android.media.MediaFormat;
import android.media.MediaRecorder.AudioEncoder;
import android.media.MediaRecorder.VideoEncoder;
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
index 40284a6..192f213 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
@@ -17,7 +17,6 @@
import android.app.Instrumentation;
import android.content.Intent;
-import android.cts.util.MediaUtils;
import android.media.MediaFormat;
import android.media.MediaRecorder.AudioEncoder;
import android.media.MediaRecorder.VideoEncoder;
@@ -25,6 +24,8 @@
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
+import com.android.compatibility.common.util.MediaUtils;
+
import junit.framework.Assert;
public class NativeMediaTest extends ActivityInstrumentationTestCase2<NativeMediaActivity> {
diff --git a/tests/tests/midi/Android.mk b/tests/tests/midi/Android.mk
index 3dc0c8b..eeda8c8 100755
--- a/tests/tests/midi/Android.mk
+++ b/tests/tests/midi/Android.mk
@@ -25,7 +25,7 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/multiuser/Android.mk b/tests/tests/multiuser/Android.mk
index ae1be7e..67db1f5 100644
--- a/tests/tests/multiuser/Android.mk
+++ b/tests/tests/multiuser/Android.mk
@@ -27,7 +27,7 @@
LOCAL_PACKAGE_NAME := CtsMultiUserTestCases
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_SDK_VERSION := test_current
diff --git a/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java b/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java
index 206a613..3e9122b 100644
--- a/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java
+++ b/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java
@@ -16,8 +16,8 @@
package android.multiuser.cts;
+import com.android.compatibility.common.util.SystemUtil;
-import android.cts.util.SystemUtil;
import android.os.UserManager;
import android.test.InstrumentationTestCase;
import android.util.Log;
diff --git a/tests/tests/net/Android.mk b/tests/tests/net/Android.mk
index c553a9b..4a77640 100644
--- a/tests/tests/net/Android.mk
+++ b/tests/tests/net/Android.mk
@@ -34,7 +34,7 @@
LOCAL_PACKAGE_NAME := CtsNetTestCases
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support ctsdeviceutil \
+LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support compatibility-device-util \
ctstestrunner ctstestserver mockwebserver
# uncomment when b/13249961 is fixed
diff --git a/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java b/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java
index 7987a50..198f973 100644
--- a/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java
+++ b/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java
@@ -21,9 +21,10 @@
import junit.framework.TestCase;
-import android.cts.util.FileUtils;
import android.net.http.HttpResponseCache;
+import com.android.compatibility.common.util.FileUtils;
+
import java.io.File;
import java.io.InputStream;
import java.net.CacheRequest;
diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
index 696d215..5983cb7 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.cts.util.PollingCheck;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
@@ -29,6 +28,8 @@
import android.net.wifi.WifiSsid;
import android.test.AndroidTestCase;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.concurrent.Callable;
public class WifiInfoTest extends AndroidTestCase {
diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk
index eea3b86..46e316a 100644
--- a/tests/tests/openglperf/Android.mk
+++ b/tests/tests/openglperf/Android.mk
@@ -24,7 +24,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_JNI_SHARED_LIBRARIES := libctsopenglperf_jni libnativehelper_compat_libc++
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java
index b286e46..1d79961 100644
--- a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java
+++ b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java
@@ -16,8 +16,9 @@
package android.openglperf.cts;
+import com.android.compatibility.common.util.WatchDog;
+
import android.content.Context;
-import android.cts.util.WatchDog;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.opengl.GLES20;
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
index afe664f..16c8a32 100755
--- a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
+++ b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
@@ -16,8 +16,9 @@
package android.openglperf.cts;
+import com.android.compatibility.common.util.WatchDog;
+
import android.content.Context;
-import android.cts.util.WatchDog;
class PlanetsSurfaceView extends GLSurfaceViewCustom {
private final long RENDERING_TIMEOUT = 1900; // in msec, close to 2 secs
diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index 0c564a7..7effcab 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk
@@ -25,7 +25,7 @@
LOCAL_MULTILIB := both
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-test ctsdeviceutil ctstestrunner guava platform-test-annotations
+ android-support-test compatibility-device-util ctstestrunner guava platform-test-annotations
LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libctsos_jni libnativehelper_compat_libc++
diff --git a/tests/tests/os/src/android/os/cts/AbiTest.java b/tests/tests/os/src/android/os/cts/AbiTest.java
index 1d343e6..49ff8aa 100644
--- a/tests/tests/os/src/android/os/cts/AbiTest.java
+++ b/tests/tests/os/src/android/os/cts/AbiTest.java
@@ -16,9 +16,10 @@
package android.os.cts;
-import android.cts.util.ReadElf;
import android.util.ArraySet;
+import com.android.compatibility.common.util.ReadElf;
+
import java.io.File;
import java.util.Arrays;
diff --git a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
index 1c9aaba..335818a 100644
--- a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
+++ b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
@@ -17,11 +17,11 @@
package android.os.cts;
import android.support.annotation.NonNull;
-
-import android.cts.util.PollingCheck;
import android.os.AsyncTask;
import android.test.InstrumentationTestCase;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
diff --git a/tests/tests/os/src/android/os/cts/ConditionVariableTest.java b/tests/tests/os/src/android/os/cts/ConditionVariableTest.java
index cad9dec..d5593dc 100644
--- a/tests/tests/os/src/android/os/cts/ConditionVariableTest.java
+++ b/tests/tests/os/src/android/os/cts/ConditionVariableTest.java
@@ -16,9 +16,11 @@
package android.os.cts;
import junit.framework.TestCase;
-import android.cts.util.TestThread;
+
import android.os.ConditionVariable;
+import com.android.compatibility.common.util.TestThread;
+
public class ConditionVariableTest extends TestCase {
private static final int WAIT_TIME = 3000;
private static final int BLOCK_TIME = 1000;
diff --git a/tests/tests/os/src/android/os/cts/DebugTest.java b/tests/tests/os/src/android/os/cts/DebugTest.java
index 8301cfc..0f19078 100644
--- a/tests/tests/os/src/android/os/cts/DebugTest.java
+++ b/tests/tests/os/src/android/os/cts/DebugTest.java
@@ -15,6 +15,14 @@
*/
package android.os.cts;
+import android.content.Context;
+import android.os.Debug;
+import android.test.AndroidTestCase;
+
+import com.android.compatibility.common.util.TestThread;
+
+import dalvik.system.VMDebug;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -22,12 +30,6 @@
import java.util.logging.Logger;
import java.util.Map;
-import android.content.Context;
-import android.cts.util.TestThread;
-import android.os.Debug;
-import android.test.AndroidTestCase;
-import dalvik.system.VMDebug;
-
public class DebugTest extends AndroidTestCase {
private static final Logger Log = Logger.getLogger(DebugTest.class.getName());
diff --git a/tests/tests/os/src/android/os/cts/HandlerTest.java b/tests/tests/os/src/android/os/cts/HandlerTest.java
index 7183d7e..d161f6a 100644
--- a/tests/tests/os/src/android/os/cts/HandlerTest.java
+++ b/tests/tests/os/src/android/os/cts/HandlerTest.java
@@ -17,7 +17,7 @@
package android.os.cts;
import junit.framework.TestCase;
-import android.cts.util.TestThread;
+
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -26,6 +26,8 @@
import android.test.UiThreadTest;
import android.util.Printer;
+import com.android.compatibility.common.util.TestThread;
+
public class HandlerTest extends TestCase {
public static final int MESSAGE_WHAT = 3;
diff --git a/tests/tests/os/src/android/os/cts/LocalService.java b/tests/tests/os/src/android/os/cts/LocalService.java
index cc427f8..41f1c18 100644
--- a/tests/tests/os/src/android/os/cts/LocalService.java
+++ b/tests/tests/os/src/android/os/cts/LocalService.java
@@ -18,12 +18,13 @@
import android.app.Service;
import android.content.Intent;
-import android.cts.util.IBinderParcelable;
import android.os.Binder;
import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
+import com.android.compatibility.common.util.IBinderParcelable;
+
public class LocalService extends Service {
public static final String SERVICE_LOCAL =
"android.os.cts.activity.SERVICE_LOCAL";
diff --git a/tests/tests/os/src/android/os/cts/LooperTest.java b/tests/tests/os/src/android/os/cts/LooperTest.java
index 6f7cb6d..c0a176c 100644
--- a/tests/tests/os/src/android/os/cts/LooperTest.java
+++ b/tests/tests/os/src/android/os/cts/LooperTest.java
@@ -16,7 +16,6 @@
package android.os.cts;
-import android.cts.util.TestThread;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -26,6 +25,8 @@
import android.util.Printer;
import android.util.StringBuilderPrinter;
+import com.android.compatibility.common.util.TestThread;
+
public class LooperTest extends AndroidTestCase {
public static final long WAIT_TIME = 1000;
diff --git a/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java b/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
index f9a58ad..13df2a9 100644
--- a/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
+++ b/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
@@ -23,7 +23,6 @@
import android.content.res.Resources.NotFoundException;
import android.os.Environment;
import android.os.Parcel;
-import android.cts.util.FileUtils;
import android.os.storage.OnObbStateChangeListener;
import android.os.storage.StorageManager;
import android.os.storage.StorageVolume;
@@ -31,6 +30,8 @@
import android.test.ComparisonFailure;
import android.util.Log;
+import com.android.compatibility.common.util.FileUtils;
+
import libcore.io.Streams;
import java.io.File;
diff --git a/tests/tests/permission2/Android.mk b/tests/tests/permission2/Android.mk
index dda9553..d4f48f4 100755
--- a/tests/tests/permission2/Android.mk
+++ b/tests/tests/permission2/Android.mk
@@ -26,7 +26,7 @@
LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java b/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
index 8ae0692..e1505f7 100644
--- a/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
@@ -16,10 +16,11 @@
package android.permission2.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PermissionInfo;
-import android.cts.util.SystemUtil;
import android.support.test.InstrumentationRegistry;
import android.test.AndroidTestCase;
import android.util.Log;
diff --git a/tests/tests/print/Android.mk b/tests/tests/print/Android.mk
index 42a98e5..405c89e 100644
--- a/tests/tests/print/Android.mk
+++ b/tests/tests/print/Android.mk
@@ -27,7 +27,7 @@
LOCAL_PACKAGE_NAME := CtsPrintTestCases
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target-minus-junit4 ctstestrunner ub-uiautomator ctsdeviceutil android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target-minus-junit4 ctstestrunner ub-uiautomator compatibility-device-util android-support-test
LOCAL_SDK_VERSION := test_current
diff --git a/tests/tests/print/src/android/print/cts/BasePrintTest.java b/tests/tests/print/src/android/print/cts/BasePrintTest.java
index cdb470e..73d5285 100644
--- a/tests/tests/print/src/android/print/cts/BasePrintTest.java
+++ b/tests/tests/print/src/android/print/cts/BasePrintTest.java
@@ -17,6 +17,7 @@
package android.print.cts;
import static android.print.cts.Utils.getPrintManager;
+
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
@@ -32,7 +33,6 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Resources;
-import android.cts.util.SystemUtil;
import android.graphics.pdf.PdfDocument;
import android.os.Bundle;
import android.os.CancellationSignal;
@@ -62,6 +62,8 @@
import android.support.test.uiautomator.UiSelector;
import android.util.Log;
+import com.android.compatibility.common.util.SystemUtil;
+
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.junit.After;
diff --git a/tests/tests/provider/Android.mk b/tests/tests/provider/Android.mk
index eb0406e..6a7d871 100644
--- a/tests/tests/provider/Android.mk
+++ b/tests/tests/provider/Android.mk
@@ -31,7 +31,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := \
- ctsdeviceutil ctstestrunner ub-uiautomator
+ compatibility-device-util ctstestrunner ub-uiautomator
LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativehelper_compat_libc++
diff --git a/tests/tests/provider/src/android/provider/cts/CalendarTest.java b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
index df31a19..8db5e45 100644
--- a/tests/tests/provider/src/android/provider/cts/CalendarTest.java
+++ b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
@@ -25,7 +25,6 @@
import android.content.EntityIterator;
import android.content.Intent;
import android.content.IntentFilter;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
@@ -48,6 +47,8 @@
import android.text.format.Time;
import android.util.Log;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
index 8c97c22..b91022d 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
@@ -19,7 +19,6 @@
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
-import android.cts.util.FileUtils;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Contacts;
@@ -28,6 +27,8 @@
import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
import android.test.InstrumentationTestCase;
+import com.android.compatibility.common.util.FileUtils;
+
import java.io.IOException;
import java.io.InputStream;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java
index 3bd81ce..9c9d9ca 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java
@@ -21,7 +21,6 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.res.AssetFileDescriptor;
-import android.cts.util.FileCopyHelper;
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
@@ -32,6 +31,8 @@
import android.provider.cts.MediaStoreAudioTestHelper.Audio2;
import android.test.AndroidTestCase;
+import com.android.compatibility.common.util.FileCopyHelper;
+
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
index 8fe95f5..d0db60d 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
@@ -22,7 +22,6 @@
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
-import android.cts.util.FileCopyHelper;
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
@@ -33,6 +32,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.FileCopyHelper;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
index 1c00aac..7a66c8c 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
@@ -21,8 +21,6 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.FileUtils;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -34,6 +32,9 @@
import android.test.InstrumentationTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.FileUtils;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.lang.Math;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
index db3db6b..62a041b 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
@@ -22,7 +22,6 @@
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
-import android.cts.util.FileCopyHelper;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -34,6 +33,8 @@
import android.provider.MediaStore.MediaColumns;
import android.test.InstrumentationTestCase;
+import com.android.compatibility.common.util.FileCopyHelper;
+
import java.io.File;
import java.util.ArrayList;
import android.util.DisplayMetrics;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
index e50f18a..8ba8c17 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
@@ -21,13 +21,14 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
-import android.cts.util.FileCopyHelper;
import android.database.Cursor;
import android.net.Uri;
import android.provider.MediaStore.Video;
import android.provider.MediaStore.Video.VideoColumns;
import android.test.InstrumentationTestCase;
+import com.android.compatibility.common.util.FileCopyHelper;
+
import java.util.ArrayList;
public class MediaStore_VideoTest extends InstrumentationTestCase {
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
index 485b39c..14e76bb 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
@@ -22,8 +22,6 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.FileUtils;
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
@@ -32,6 +30,9 @@
import android.provider.MediaStore.Video.VideoColumns;
import android.test.AndroidTestCase;
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.FileUtils;
+
import java.io.File;
import java.io.IOException;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
index 8e51cb8..26f353f 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
@@ -21,8 +21,6 @@
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.MediaUtils;
import android.database.Cursor;
import android.media.MediaCodecInfo;
import android.media.MediaCodecList;
@@ -34,6 +32,9 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.File;
import java.io.IOException;
diff --git a/tests/tests/provider/src/android/provider/cts/PhotoUtil.java b/tests/tests/provider/src/android/provider/cts/PhotoUtil.java
index 4debd8f..49d57a7 100644
--- a/tests/tests/provider/src/android/provider/cts/PhotoUtil.java
+++ b/tests/tests/provider/src/android/provider/cts/PhotoUtil.java
@@ -19,7 +19,7 @@
import android.provider.cts.R;
import android.content.Context;
-import android.cts.util.FileUtils;
+import com.android.compatibility.common.util.FileUtils;
import java.io.InputStream;
diff --git a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
index a17bcdd..ff79ae5 100644
--- a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
@@ -19,12 +19,13 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.net.Uri;
import android.provider.SearchRecentSuggestions;
import android.test.ProviderTestCase2;
+import com.android.compatibility.common.util.PollingCheck;
+
public class SearchRecentSuggestionsTest extends
ProviderTestCase2<TestSearchRecentSuggestionsProvider> {
private final static String AUTHORITY_HEAD = "content://"
diff --git a/tests/tests/provider/src/android/provider/cts/SettingsTest.java b/tests/tests/provider/src/android/provider/cts/SettingsTest.java
index 382f911..71de3bd 100644
--- a/tests/tests/provider/src/android/provider/cts/SettingsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SettingsTest.java
@@ -16,6 +16,8 @@
package android.provider.cts;
+import com.android.compatibility.common.util.SystemUtil;
+
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -23,7 +25,6 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.cts.util.SystemUtil;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.sqlite.SQLiteException;
diff --git a/tests/tests/security/Android.mk b/tests/tests/security/Android.mk
index c739fa5..b335065 100644
--- a/tests/tests/security/Android.mk
+++ b/tests/tests/security/Android.mk
@@ -21,7 +21,7 @@
# Include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver ctstestrunner ctsdeviceutil compatibility-device-util guava
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver ctstestrunner compatibility-device-util guava
LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy
diff --git a/tests/tests/security/src/android/security/cts/AslrTest.java b/tests/tests/security/src/android/security/cts/AslrTest.java
index 774df87..2cc4825 100644
--- a/tests/tests/security/src/android/security/cts/AslrTest.java
+++ b/tests/tests/security/src/android/security/cts/AslrTest.java
@@ -32,7 +32,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import android.cts.util.ReadElf;
+import com.android.compatibility.common.util.ReadElf;
/**
* Verify that ASLR is properly enabled on Android Compatible devices.
diff --git a/tests/tests/security/src/android/security/cts/BannedFilesTest.java b/tests/tests/security/src/android/security/cts/BannedFilesTest.java
index 02c4128..d4ae7d9 100644
--- a/tests/tests/security/src/android/security/cts/BannedFilesTest.java
+++ b/tests/tests/security/src/android/security/cts/BannedFilesTest.java
@@ -16,9 +16,10 @@
package android.security.cts;
-import android.cts.util.FileUtils;
import android.platform.test.annotations.RestrictedBuildTest;
+import com.android.compatibility.common.util.FileUtils;
+
import junit.framework.TestCase;
import java.io.DataInputStream;
diff --git a/tests/tests/security/src/android/security/cts/HwRngTest.java b/tests/tests/security/src/android/security/cts/HwRngTest.java
index e654f9d..f8c4684 100644
--- a/tests/tests/security/src/android/security/cts/HwRngTest.java
+++ b/tests/tests/security/src/android/security/cts/HwRngTest.java
@@ -16,7 +16,7 @@
package android.security.cts;
-import android.cts.util.CtsAndroidTestCase;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.ResultType;
diff --git a/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java b/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java
index a0d359f7..e454e2c 100644
--- a/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java
+++ b/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java
@@ -17,7 +17,6 @@
package android.security.cts;
import android.content.res.AssetFileDescriptor;
-import android.cts.util.MediaUtils;
import android.drm.DrmConvertedStatus;
import android.drm.DrmManagerClient;
import android.media.MediaPlayer;
@@ -27,6 +26,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
diff --git a/tests/tests/shortcutmanager/Android.mk b/tests/tests/shortcutmanager/Android.mk
index 8c03be7..49a3b70 100755
--- a/tests/tests/shortcutmanager/Android.mk
+++ b/tests/tests/shortcutmanager/Android.mk
@@ -24,7 +24,7 @@
android-support-test \
android-support-v4 \
mockito-target-minus-junit4 \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
ub-uiautomator \
ShortcutManagerTestUtils
diff --git a/tests/tests/shortcutmanager/throttling/Android.mk b/tests/tests/shortcutmanager/throttling/Android.mk
index 4af2d7c..7e6d869 100644
--- a/tests/tests/shortcutmanager/throttling/Android.mk
+++ b/tests/tests/shortcutmanager/throttling/Android.mk
@@ -32,7 +32,7 @@
android-support-test \
android-support-v4 \
mockito-target-minus-junit4 \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
ub-uiautomator \
ShortcutManagerTestUtils
diff --git a/tests/tests/telephony/Android.mk b/tests/tests/telephony/Android.mk
index 01b1e9c..75da56e 100644
--- a/tests/tests/telephony/Android.mk
+++ b/tests/tests/telephony/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_HOST_SHARED_LIBRARIES := compatibility-device-telephony-preconditions
diff --git a/tests/tests/telephony/preconditions/app/Android.mk b/tests/tests/telephony/preconditions/app/Android.mk
index eecacd8..349daed 100644
--- a/tests/tests/telephony/preconditions/app/Android.mk
+++ b/tests/tests/telephony/preconditions/app/Android.mk
@@ -28,7 +28,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctstestrunner \
- compatibility-device-util ctsdeviceutil \
+ compatibility-device-util \
compatibility-device-preconditions
# tag this module as a cts test artifact
@@ -38,4 +38,4 @@
LOCAL_SDK_VERSION := current
-include $(BUILD_CTS_PACKAGE)
\ No newline at end of file
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java b/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java
index 9205f0e..6c180b4 100644
--- a/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java
@@ -17,8 +17,6 @@
import android.content.Context;
-import android.cts.util.ReadElf;
-import android.cts.util.TestThread;
import android.os.Looper;
import android.net.ConnectivityManager;
import android.telephony.CellLocation;
@@ -29,6 +27,9 @@
import android.content.pm.PackageManager;
import android.util.Log;
+import com.android.compatibility.common.util.ReadElf;
+import com.android.compatibility.common.util.TestThread;
+
public class CellLocationTest extends AndroidTestCase{
private boolean mOnCellLocationChangedCalled;
private final Object mLock = new Object();
diff --git a/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java b/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java
index 18aa23f..d18a9f5 100644
--- a/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java
@@ -16,8 +16,6 @@
package android.telephony.cts;
import android.content.Context;
-import android.cts.util.ReadElf;
-import android.cts.util.TestThread;
import android.os.Looper;
import android.telephony.CellLocation;
import android.telephony.PhoneStateListener;
@@ -29,6 +27,9 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.ReadElf;
+import com.android.compatibility.common.util.TestThread;
+
public class PhoneStateListenerTest extends AndroidTestCase{
public static final long WAIT_TIME = 1000;
diff --git a/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
index 9b08397..f7ec3b7 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
@@ -17,7 +17,6 @@
package android.telephony.cts;
import android.content.Context;
-import android.cts.util.TestThread;
import android.net.ConnectivityManager;
import android.os.Looper;
import android.telephony.SubscriptionInfo;
@@ -25,6 +24,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.TestThread;
+
import java.util.List;
public class SubscriptionManagerTest extends AndroidTestCase {
diff --git a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
index 50820b2..b4d1e9b 100644
--- a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
@@ -27,7 +27,6 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.TestThread;
import android.net.ConnectivityManager;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
@@ -44,6 +43,7 @@
import android.telephony.TelephonyManager;
import android.util.Log;
+import com.android.compatibility.common.util.TestThread;
import com.android.internal.telephony.PhoneConstants;
import org.junit.After;
diff --git a/tests/tests/telephony2/Android.mk b/tests/tests/telephony2/Android.mk
index dbd2559..08a7df3 100644
--- a/tests/tests/telephony2/Android.mk
+++ b/tests/tests/telephony2/Android.mk
@@ -22,7 +22,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk
index 679a049..2210cbd 100644
--- a/tests/tests/text/Android.mk
+++ b/tests/tests/text/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES += \
- ctsdeviceutil \
+ compatibility-device-util \
ctsdeviceutillegacy \
ctstestrunner \
android-support-test \
diff --git a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
index 10b494e..e78fb3e 100644
--- a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
@@ -16,7 +16,7 @@
package android.text.cts;
-import static android.cts.util.WidgetTestUtils.sameCharSequence;
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java b/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java
index a15233d..fcbc510 100644
--- a/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java
+++ b/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java
@@ -17,10 +17,11 @@
package android.text.cts;
import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
import android.os.Bundle;
import android.webkit.WebView;
+import com.android.compatibility.common.util.NullWebViewUtils;
+
public class EmojiCtsActivity extends Activity {
private WebView mWebView;
diff --git a/tests/tests/text/src/android/text/cts/EmojiTest.java b/tests/tests/text/src/android/text/cts/EmojiTest.java
index 591c613..2e5bbad 100644
--- a/tests/tests/text/src/android/text/cts/EmojiTest.java
+++ b/tests/tests/text/src/android/text/cts/EmojiTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.cts.util.NullWebViewUtils;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
@@ -39,6 +38,8 @@
import android.widget.EditText;
import android.widget.TextView;
+import com.android.compatibility.common.util.NullWebViewUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/text/src/android/text/format/cts/DateFormatTest.java b/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
index 341cae5..4529f2a 100644
--- a/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
@@ -24,7 +24,6 @@
import android.app.UiAutomation;
import android.content.Context;
-import android.cts.util.SystemUtil;
import android.os.ParcelFileDescriptor;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
@@ -32,6 +31,8 @@
import android.support.test.runner.AndroidJUnit4;
import android.text.format.DateFormat;
+import com.android.compatibility.common.util.SystemUtil;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
index 2f84486..7057913 100644
--- a/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
@@ -25,7 +25,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
@@ -47,6 +46,8 @@
import android.widget.TextView;
import android.widget.TextView.BufferType;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
index 7fd1b04..91618b9 100644
--- a/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
@@ -20,7 +20,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.cts.util.CtsKeyEventUtil;
import android.os.SystemClock;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
@@ -34,6 +33,8 @@
import android.view.KeyEvent;
import android.widget.TextView.BufferType;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
index 5a9460e..aeff39d 100644
--- a/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
@@ -27,7 +27,6 @@
import android.annotation.NonNull;
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.WidgetTestUtils;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
@@ -44,6 +43,8 @@
import android.widget.FrameLayout;
import android.widget.TextView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java
index 77d1a6a..397b6f7 100644
--- a/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java
@@ -21,13 +21,14 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import android.cts.util.CtsKeyEventUtil;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.text.InputType;
import android.text.method.DateKeyListener;
import android.view.KeyEvent;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java
index dbb5ef8..e0647f5 100644
--- a/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import android.cts.util.CtsKeyEventUtil;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.text.InputType;
@@ -29,6 +28,8 @@
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java
index b30d42d..7ea5f7e 100644
--- a/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java
@@ -22,7 +22,6 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import android.cts.util.CtsKeyEventUtil;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.text.InputType;
@@ -32,6 +31,8 @@
import android.text.method.DigitsKeyListener;
import android.view.KeyEvent;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
index 2f4b250..8d47c57 100644
--- a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
+++ b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
@@ -17,7 +17,6 @@
package android.text.method.cts;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
import android.support.test.InstrumentationRegistry;
import android.support.test.rule.ActivityTestRule;
import android.text.cts.R;
@@ -25,6 +24,8 @@
import android.view.KeyEvent;
import android.widget.EditText;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
index 6852df9..c4a7944 100644
--- a/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
@@ -22,7 +22,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import android.cts.util.CtsKeyEventUtil;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.text.Selection;
@@ -33,6 +32,8 @@
import android.view.KeyEvent;
import android.widget.TextView.BufferType;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
index b8f7608..3ed0ad4 100644
--- a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
@@ -32,8 +32,6 @@
import android.app.Instrumentation;
import android.app.UiAutomation;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.PollingCheck;
import android.os.ParcelFileDescriptor;
import android.provider.Settings.SettingNotFoundException;
import android.provider.Settings.System;
@@ -49,6 +47,9 @@
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java
index a79d753..32c6e5e 100644
--- a/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java
@@ -25,7 +25,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.WidgetTestUtils;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
@@ -47,6 +46,8 @@
import android.widget.TextView;
import android.widget.TextView.BufferType;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java
index 4019e2e..7851ded 100644
--- a/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java
@@ -30,7 +30,6 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
-import android.cts.util.CtsKeyEventUtil;
import android.os.SystemClock;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
@@ -46,6 +45,8 @@
import android.view.KeyEvent;
import android.widget.TextView.BufferType;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java
index 9515ab9..6701515 100644
--- a/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import android.cts.util.CtsKeyEventUtil;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.text.InputType;
@@ -29,6 +28,8 @@
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java b/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java
index 7d14e7a..130593b 100644
--- a/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertSame;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
@@ -33,6 +32,8 @@
import android.text.style.DynamicDrawableSpan;
import android.text.style.ImageSpan;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/transition/Android.mk b/tests/tests/transition/Android.mk
index 00d8ad5..a80f43c 100644
--- a/tests/tests/transition/Android.mk
+++ b/tests/tests/transition/Android.mk
@@ -28,7 +28,7 @@
android-support-test \
mockito-target-minus-junit4 \
android-common \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
platform-test-annotations
diff --git a/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java b/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
index e06e6fb..7543dae 100644
--- a/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
@@ -15,7 +15,7 @@
*/
package android.transition.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static junit.framework.Assert.fail;
@@ -27,10 +27,6 @@
import android.app.ActivityOptions;
import android.content.Intent;
-import android.cts.util.PollingCheck;
-import android.cts.util.transition.TargetTracking;
-import android.cts.util.transition.TrackingTransition;
-import android.cts.util.transition.TrackingVisibility;
import android.os.Bundle;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
@@ -38,6 +34,11 @@
import android.transition.Transition.TransitionListener;
import android.view.View;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.transition.TargetTracking;
+import com.android.compatibility.common.util.transition.TrackingTransition;
+import com.android.compatibility.common.util.transition.TrackingVisibility;
+
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java b/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java
index 6b7f5ae..5917ace 100644
--- a/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java
@@ -15,7 +15,7 @@
*/
package android.transition.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
@@ -25,7 +25,6 @@
import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.app.Instrumentation;
-import android.cts.util.WidgetTestUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.rule.ActivityTestRule;
import android.transition.Scene;
@@ -37,6 +36,8 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java b/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java
index d746dcd..b4bf800 100644
--- a/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java
+++ b/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java
@@ -15,7 +15,7 @@
*/
package android.transition.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/tests/tests/transition/src/android/transition/cts/TargetActivity.java b/tests/tests/transition/src/android/transition/cts/TargetActivity.java
index dd4bd08..68175d5 100644
--- a/tests/tests/transition/src/android/transition/cts/TargetActivity.java
+++ b/tests/tests/transition/src/android/transition/cts/TargetActivity.java
@@ -19,11 +19,12 @@
import android.app.Activity;
import android.content.Intent;
-import android.cts.util.transition.TrackingTransition;
-import android.cts.util.transition.TrackingVisibility;
import android.os.Bundle;
import android.transition.Transition.TransitionListener;
+import com.android.compatibility.common.util.transition.TrackingTransition;
+import com.android.compatibility.common.util.transition.TrackingVisibility;
+
public class TargetActivity extends Activity {
public static final String EXTRA_LAYOUT_ID = "layoutId";
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java b/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java
index 7972933..60cd5b0 100644
--- a/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java
+++ b/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java
@@ -15,7 +15,7 @@
*/
package android.transition.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionTest.java b/tests/tests/transition/src/android/transition/cts/TransitionTest.java
index 6c577fd..506ea7b 100644
--- a/tests/tests/transition/src/android/transition/cts/TransitionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/TransitionTest.java
@@ -15,7 +15,7 @@
*/
package android.transition.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/tests/tests/tv/Android.mk b/tests/tests/tv/Android.mk
index 749e3d1..640e16e 100644
--- a/tests/tests/tv/Android.mk
+++ b/tests/tests/tv/Android.mk
@@ -29,7 +29,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
index 9769175..4fe84f7 100644
--- a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.media.tv.TvContract;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
@@ -29,6 +28,8 @@
import android.tv.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java b/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
index a7b5805..2acf5ce 100644
--- a/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.media.tv.TvContract;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
@@ -31,6 +30,8 @@
import android.tv.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
index 526f401..e1c165b 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
@@ -19,7 +19,6 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
import android.media.tv.TvContentRating;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
@@ -27,6 +26,8 @@
import android.os.Handler;
import android.test.ActivityInstrumentationTestCase2;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
index 47b5527..ab2073b 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.media.PlaybackParams;
import android.media.tv.TvContentRating;
import android.media.tv.TvContract;
@@ -45,6 +44,8 @@
import android.tv.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java b/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
index 59cb902..47a6517 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.media.tv.TvContract;
import android.media.tv.TvInputInfo;
@@ -38,6 +37,8 @@
import android.tv.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/tests/tests/uirendering/Android.mk b/tests/tests/uirendering/Android.mk
index 4dd9b1d..e1f6eef 100644
--- a/tests/tests/uirendering/Android.mk
+++ b/tests/tests/uirendering/Android.mk
@@ -27,8 +27,8 @@
LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := \
+ compatibility-device-util \
ctstestrunner \
- ctsdeviceutil \
mockito-target-minus-junit4 \
android-support-test
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java
index 8b83dc0..52b87cc 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java
@@ -15,8 +15,9 @@
*/
package android.uirendering.cts.testclasses;
+import com.android.compatibility.common.util.SynchronousPixelCopy;
+
import android.animation.ObjectAnimator;
-import android.cts.util.SynchronousPixelCopy;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java
index f961cdb..e340899 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java
@@ -15,10 +15,11 @@
*/
package android.uirendering.cts.testinfrastructure;
+import com.android.compatibility.common.util.SynchronousPixelCopy;
+
import android.annotation.Nullable;
import android.app.Instrumentation;
import android.content.Intent;
-import android.cts.util.SynchronousPixelCopy;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Point;
diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk
index 8256643..9b505dd 100644
--- a/tests/tests/view/Android.mk
+++ b/tests/tests/view/Android.mk
@@ -30,7 +30,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
mockito-target-minus-junit4 \
platform-test-annotations \
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
index 0d700af..c47b4b1 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
@@ -34,7 +34,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.res.XmlResourceParser;
-import android.cts.util.PollingCheck;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
@@ -54,6 +53,8 @@
import android.view.animation.Transformation;
import android.view.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java b/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java
index 621a7ec..9c845c1 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java
@@ -17,7 +17,6 @@
package android.view.animation.cts;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
import android.os.SystemClock;
import android.support.test.rule.ActivityTestRule;
import android.view.View;
@@ -25,6 +24,8 @@
import android.view.animation.Animation;
import android.view.animation.LayoutAnimationController;
+import com.android.compatibility.common.util.PollingCheck;
+
/**
* The utility methods for animation test.
*/
diff --git a/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java b/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
index 2f874fc..25c7861 100644
--- a/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
+++ b/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
@@ -21,8 +21,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
@@ -35,6 +33,9 @@
import android.view.Window;
import android.widget.ScrollView;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/MenuInflaterTest.java b/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
index d0a5b09..9da739e 100644
--- a/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
+++ b/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
@@ -23,7 +23,6 @@
import android.app.Activity;
import android.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
@@ -36,6 +35,8 @@
import android.view.SubMenu;
import android.widget.PopupMenu;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyTest.java b/tests/tests/view/src/android/view/cts/PixelCopyTest.java
index 7c4ca3e..0f37f41 100644
--- a/tests/tests/view/src/android/view/cts/PixelCopyTest.java
+++ b/tests/tests/view/src/android/view/cts/PixelCopyTest.java
@@ -24,7 +24,6 @@
import static org.mockito.Mockito.when;
import android.app.Instrumentation;
-import android.cts.util.SynchronousPixelCopy;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Color;
@@ -43,6 +42,8 @@
import android.view.View;
import android.view.Window;
+import com.android.compatibility.common.util.SynchronousPixelCopy;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java b/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java
index e250390..246e5aa 100644
--- a/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java
+++ b/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java
@@ -17,12 +17,13 @@
package android.view.cts;
import android.app.Activity;
-import android.cts.util.MediaUtils;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.widget.VideoView;
+import com.android.compatibility.common.util.MediaUtils;
+
import java.util.concurrent.CountDownLatch;
public class PixelCopyVideoSourceActivity extends Activity {
diff --git a/tests/tests/view/src/android/view/cts/SearchEventTest.java b/tests/tests/view/src/android/view/cts/SearchEventTest.java
index c0115d7..9ae9e61 100644
--- a/tests/tests/view/src/android/view/cts/SearchEventTest.java
+++ b/tests/tests/view/src/android/view/cts/SearchEventTest.java
@@ -21,7 +21,6 @@
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.hardware.input.InputManager;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
@@ -31,6 +30,8 @@
import android.view.KeyEvent;
import android.view.SearchEvent;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/SurfaceViewTest.java b/tests/tests/view/src/android/view/cts/SurfaceViewTest.java
index b7fd98e..277a094 100644
--- a/tests/tests/view/src/android/view/cts/SurfaceViewTest.java
+++ b/tests/tests/view/src/android/view/cts/SurfaceViewTest.java
@@ -22,8 +22,6 @@
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.PollingCheck;
import android.graphics.PixelFormat;
import android.graphics.Region;
import android.support.test.InstrumentationRegistry;
@@ -36,6 +34,9 @@
import android.view.SurfaceView;
import android.view.cts.SurfaceViewCtsActivity.MockSurfaceView;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/TextureViewTest.java b/tests/tests/view/src/android/view/cts/TextureViewTest.java
index bb26fdd..a9e215b 100644
--- a/tests/tests/view/src/android/view/cts/TextureViewTest.java
+++ b/tests/tests/view/src/android/view/cts/TextureViewTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Point;
@@ -31,6 +30,8 @@
import android.support.test.runner.AndroidJUnit4;
import android.view.View;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -121,4 +122,4 @@
}
throw new TimeoutException();
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/view/src/android/view/cts/TooltipTest.java b/tests/tests/view/src/android/view/cts/TooltipTest.java
index b4c94b0..1903431 100644
--- a/tests/tests/view/src/android/view/cts/TooltipTest.java
+++ b/tests/tests/view/src/android/view/cts/TooltipTest.java
@@ -22,8 +22,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.PollingCheck;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
@@ -37,6 +35,9 @@
import android.view.ViewConfiguration;
import android.view.ViewGroup;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupCtsActivity.java b/tests/tests/view/src/android/view/cts/ViewGroupCtsActivity.java
index 52254a9..7bad954 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupCtsActivity.java
@@ -17,11 +17,12 @@
package android.view.cts;
import android.app.Activity;
-import android.cts.util.CTSResult;
import android.os.Bundle;
import android.os.Handler;
import android.widget.TextView;
+import com.android.compatibility.common.util.CTSResult;
+
public class ViewGroupCtsActivity extends Activity {
public static final String ACTION_INVALIDATE_CHILD = "invalidateChild";
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java b/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
index 7d10fb2..f1b3ea5 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
@@ -26,7 +26,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
@@ -43,6 +42,8 @@
import android.view.ViewGroupOverlay;
import android.view.cts.util.DrawingUtils;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupTest.java b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
index 8ddb808..395a4a7 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
@@ -32,7 +32,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.XmlResourceParser;
-import android.cts.util.CTSResult;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
@@ -72,6 +71,8 @@
import android.view.cts.util.XmlUtils;
import android.widget.TextView;
+import com.android.compatibility.common.util.CTSResult;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 72cd656..86decd9 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -43,8 +43,6 @@
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@@ -103,6 +101,8 @@
import android.widget.EditText;
import android.widget.LinearLayout;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
import com.android.internal.view.menu.ContextMenuBuilder;
import org.junit.Before;
diff --git a/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java b/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
index 9a00d8c..4aa7377 100644
--- a/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
@@ -16,7 +16,7 @@
package android.view.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyBoolean;
@@ -28,8 +28,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.PollingCheck;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
@@ -42,6 +40,9 @@
import android.widget.LinearLayout;
import android.widget.ScrollView;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/View_AnimationTest.java b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
index f7b5d00..81250ac 100644
--- a/tests/tests/view/src/android/view/cts/View_AnimationTest.java
+++ b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
@@ -24,7 +24,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
@@ -34,6 +33,8 @@
import android.view.animation.TranslateAnimation;
import android.view.animation.cts.AnimationTestUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java b/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java
index dc89796..dd731cc 100644
--- a/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java
+++ b/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java
@@ -16,7 +16,7 @@
package android.view.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -35,7 +35,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.support.test.InstrumentationRegistry;
@@ -50,6 +49,8 @@
import android.widget.RelativeLayout;
import android.widget.TextView;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/cts/WindowTest.java b/tests/tests/view/src/android/view/cts/WindowTest.java
index 406d0e6..b1bf50e 100644
--- a/tests/tests/view/src/android/view/cts/WindowTest.java
+++ b/tests/tests/view/src/android/view/cts/WindowTest.java
@@ -36,7 +36,6 @@
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.TypedArray;
-import android.cts.util.PollingCheck;
import android.graphics.Color;
import android.graphics.PixelFormat;
import android.graphics.drawable.ColorDrawable;
@@ -73,6 +72,8 @@
import android.widget.Button;
import android.widget.TextView;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java b/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
index f0c36a4..de1a202 100644
--- a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
@@ -25,7 +25,6 @@
import android.app.Instrumentation;
import android.content.ClipDescription;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.net.Uri;
import android.os.Bundle;
import android.support.test.InstrumentationRegistry;
@@ -50,6 +49,8 @@
import android.view.inputmethod.cts.util.InputConnectionTestUtils;
import android.widget.EditText;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
index f26f55a..e91ed5a 100644
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
@@ -16,7 +16,7 @@
package android.view.inputmethod.cts;
-import static android.cts.util.WidgetTestUtils.sameCharSequence;
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodManagerTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputMethodManagerTest.java
index 852ebd1..1ae1960 100644
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodManagerTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/InputMethodManagerTest.java
@@ -21,7 +21,6 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
import android.os.Handler;
import android.os.IBinder;
import android.os.ResultReceiver;
@@ -37,6 +36,8 @@
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/voiceinteraction/Android.mk b/tests/tests/voiceinteraction/Android.mk
index d64574a..cbb874a 100644
--- a/tests/tests/voiceinteraction/Android.mk
+++ b/tests/tests/voiceinteraction/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/voiceinteraction/service/Android.mk b/tests/tests/voiceinteraction/service/Android.mk
index c485f21..b8d3aa8 100644
--- a/tests/tests/voiceinteraction/service/Android.mk
+++ b/tests/tests/voiceinteraction/service/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/voicesettings/Android.mk b/tests/tests/voicesettings/Android.mk
index cbc97a2..c554470 100644
--- a/tests/tests/voicesettings/Android.mk
+++ b/tests/tests/voicesettings/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/voicesettings/AndroidManifest.xml b/tests/tests/voicesettings/AndroidManifest.xml
index dfd1de5..cf1fa1a 100644
--- a/tests/tests/voicesettings/AndroidManifest.xml
+++ b/tests/tests/voicesettings/AndroidManifest.xml
@@ -23,7 +23,7 @@
<application>
<uses-library android:name="android.test.runner" />
- <activity android:name="android.cts.util.BroadcastTestStartActivity"
+ <activity android:name="com.android.compatibility.common.util.BroadcastTestStartActivity"
android:label="The Target Activity for VoiceSettings CTS Test">
<intent-filter>
<action android:name="android.intent.action.TEST_START_ACTIVITY_ZEN_MODE" />
diff --git a/tests/tests/voicesettings/service/Android.mk b/tests/tests/voicesettings/service/Android.mk
index cc26569..6f246bd 100644
--- a/tests/tests/voicesettings/service/Android.mk
+++ b/tests/tests/voicesettings/service/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java
index 1029235..6d5470b 100644
--- a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java
+++ b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java
@@ -16,12 +16,13 @@
package android.voicesettings.service;
+import com.android.compatibility.common.util.BroadcastUtils;
+
import android.content.ComponentName;
import android.content.Intent;
import android.os.Bundle;
import android.service.voice.VoiceInteractionService;
import android.util.Log;
-import android.cts.util.BroadcastUtils;
public class MainInteractionService extends VoiceInteractionService {
static final String TAG = "MainInteractionService";
diff --git a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java
index d9a0746..87c8926 100644
--- a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java
+++ b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java
@@ -24,11 +24,12 @@
import static android.provider.Settings.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE;
import static android.provider.Settings.EXTRA_BATTERY_SAVER_MODE_ENABLED;
+import com.android.compatibility.common.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastUtils.TestcaseType;
+
import android.app.VoiceInteractor;
import android.content.Context;
import android.content.Intent;
-import android.cts.util.BroadcastUtils;
-import android.cts.util.BroadcastUtils.TestcaseType;
import android.os.AsyncTask;
import android.os.Bundle;
import android.service.voice.VoiceInteractionSession;
diff --git a/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java b/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java
index 645b4e9..9eba4c0 100644
--- a/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java
+++ b/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java
@@ -16,14 +16,14 @@
package android.voicesettings.service;
+import com.android.compatibility.common.util.BroadcastUtils;
+
import android.app.Activity;
import android.content.Intent;
import android.content.ComponentName;
import android.os.Bundle;
import android.util.Log;
-import android.cts.util.BroadcastUtils;
-
public class VoiceInteractionMain extends Activity {
static final String TAG = "VoiceInteractionMain";
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
index 44efc28..db6bbb9 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
@@ -18,8 +18,9 @@
import static android.provider.Settings.ACTION_VOICE_CONTROL_AIRPLANE_MODE;
-import android.cts.util.BroadcastTestBase;
-import android.cts.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastTestBase;
+import com.android.compatibility.common.util.BroadcastUtils;
+
import android.provider.Settings;
import android.provider.Settings.Global;
import android.util.Log;
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
index fe858fc..759d82e 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
@@ -18,8 +18,9 @@
import static android.provider.Settings.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE;
-import android.cts.util.BroadcastTestBase;
-import android.cts.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastTestBase;
+import com.android.compatibility.common.util.BroadcastUtils;
+
import android.content.Context;
import android.os.PowerManager;
import android.util.Log;
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
index f6a164d..e01f3b9 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
@@ -20,8 +20,9 @@
import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED;
import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES;
-import android.cts.util.BroadcastTestBase;
-import android.cts.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastTestBase;
+import com.android.compatibility.common.util.BroadcastUtils;
+
import android.provider.Settings;
import android.provider.Settings.Global;
import android.util.Log;
diff --git a/tests/tests/webkit/Android.mk b/tests/tests/webkit/Android.mk
index d133d80..2385647 100644
--- a/tests/tests/webkit/Android.mk
+++ b/tests/tests/webkit/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy
LOCAL_STATIC_JAVA_LIBRARIES := \
- ctsdeviceutil \
+ compatibility-device-util \
ctsdeviceutillegacy \
ctstestserver \
ctstestrunner
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
index ffde739..799545a 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
@@ -16,14 +16,15 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebView;
import android.webkit.ValueCallback;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java
index e623405..10369c6 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java
@@ -17,11 +17,12 @@
package android.webkit.cts;
import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
import android.os.Bundle;
import android.webkit.CookieSyncManager;
import android.webkit.WebView;
+import com.android.compatibility.common.util.NullWebViewUtils;
+
public class CookieSyncManagerCtsActivity extends Activity {
private WebView mWebView;
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieTest.java
index 4f89ec1..887b891 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieTest.java
@@ -16,12 +16,13 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
import android.platform.test.annotations.Presubmit;
import android.test.ActivityInstrumentationTestCase2;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
+import com.android.compatibility.common.util.NullWebViewUtils;
+
/**
* Original framework tests for CookieManager
*/
diff --git a/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java b/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
index b6dc991..9f27081 100644
--- a/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
@@ -17,9 +17,6 @@
package android.webkit.cts;
import android.content.Context;
-import android.cts.util.LocationUtils;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.location.Criteria;
import android.location.Location;
@@ -41,6 +38,10 @@
import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
+import com.android.compatibility.common.util.LocationUtils;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Callable;
diff --git a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
index 10bf6d8..dc9bf3c 100644
--- a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
@@ -16,12 +16,12 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
import android.test.ActivityInstrumentationTestCase2;
import android.webkit.HttpAuthHandler;
import android.webkit.WebView;
import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
+import com.android.compatibility.common.util.NullWebViewUtils;
import org.apache.http.HttpStatus;
diff --git a/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java b/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
index 6ffe69c..ecc3e4f 100644
--- a/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
@@ -16,8 +16,6 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.net.Uri;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
@@ -25,6 +23,9 @@
import android.webkit.WebMessagePort;
import android.webkit.WebView;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.concurrent.CountDownLatch;
import junit.framework.Assert;
diff --git a/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java b/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java
index e09e0d6..1e9f5e8 100644
--- a/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java
@@ -16,8 +16,6 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.webkit.JavascriptInterface;
@@ -29,6 +27,9 @@
import android.webkit.WebViewClient;
import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
index e7d6211..eb5b413 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
@@ -16,13 +16,13 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.webkit.WebBackForwardList;
import android.webkit.WebHistoryItem;
import android.webkit.WebView;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
public class WebBackForwardListTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
index 424d856..66b3399 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
@@ -16,8 +16,6 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.os.Message;
import android.test.ActivityInstrumentationTestCase2;
@@ -29,6 +27,9 @@
import android.webkit.WebView;
import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
public class WebChromeClientTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
private static final long TEST_TIMEOUT = 5000L;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
index dc9e615..d04fd69 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
@@ -16,8 +16,6 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.test.ActivityInstrumentationTestCase2;
import android.webkit.WebBackForwardList;
@@ -26,6 +24,9 @@
import android.webkit.WebIconDatabase;
import android.webkit.WebView;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
public class WebHistoryItemTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
private final static long TEST_TIMEOUT = 10000;
private CtsTestServer mWebServer;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 7729baf..586f398 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -16,8 +16,6 @@
package android.webkit.cts;
import android.content.Context;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.net.http.SslError;
import android.os.Build;
@@ -33,6 +31,10 @@
import android.webkit.WebViewClient;
import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
+
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.FileOutputStream;
import java.util.Locale;
import java.util.regex.Matcher;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index 2f99b49..9d01827 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -16,9 +16,6 @@
package android.webkit.cts;
-import android.cts.util.EvaluateJsResultPollingCheck;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.os.Message;
import android.test.ActivityInstrumentationTestCase2;
@@ -36,6 +33,10 @@
import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
import android.util.Pair;
+import com.android.compatibility.common.util.EvaluateJsResultPollingCheck;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java b/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java
index 1b05154..9875662 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java
@@ -19,12 +19,13 @@
import android.webkit.cts.R;
import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
import android.os.Bundle;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.webkit.WebView;
+import com.android.compatibility.common.util.NullWebViewUtils;
+
public class WebViewCtsActivity extends Activity {
private WebView mWebView;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
index e07267f..0708568 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
@@ -16,8 +16,6 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.net.Uri;
import android.net.http.SslCertificate;
import android.net.http.SslError;
@@ -34,6 +32,9 @@
import android.webkit.WebViewClient;
import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.security.KeyFactory;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index a011b97..01a88b1 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -19,9 +19,6 @@
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.AssetManager;
-import android.cts.util.EvaluateJsResultPollingCheck;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.BitmapFactory;
@@ -72,6 +69,10 @@
import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
import android.widget.LinearLayout;
+import com.android.compatibility.common.util.EvaluateJsResultPollingCheck;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import junit.framework.Assert;
import java.io.ByteArrayInputStream;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java b/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
index 4fa9b4f..b4e4d04 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
@@ -16,12 +16,12 @@
package android.webkit.cts;
-import android.cts.util.NullWebViewUtils;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
import android.webkit.WebView;
import android.webkit.WebView.WebViewTransport;
+import com.android.compatibility.common.util.NullWebViewUtils;
public class WebView_WebViewTransportTest
extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
diff --git a/tests/tests/widget/Android.mk b/tests/tests/widget/Android.mk
index 5de6d34..c19c27e 100644
--- a/tests/tests/widget/Android.mk
+++ b/tests/tests/widget/Android.mk
@@ -25,7 +25,7 @@
android-support-test \
mockito-target-minus-junit4 \
android-common \
- ctsdeviceutil \
+ compatibility-device-util \
ctstestrunner \
platform-test-annotations
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
index 9eab925..f2d70ec 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
@@ -16,7 +16,7 @@
package android.widget.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -41,15 +41,12 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.test.annotation.UiThreadTest;
import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.LargeTest;
import android.support.test.filters.MediumTest;
import android.support.test.filters.SmallTest;
@@ -74,6 +71,10 @@
import android.widget.cts.util.TestUtils;
import android.widget.cts.util.TestUtilsMatchers;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java
index d1ad3cb..3bb7d55 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java
@@ -19,7 +19,6 @@
import static org.junit.Assert.assertEquals;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
@@ -28,6 +27,8 @@
import android.widget.AbsListView;
import android.widget.AbsListView.LayoutParams;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java b/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
index 8e2c939..32fee43 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
@@ -23,8 +23,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.PollingCheck;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
@@ -41,6 +39,9 @@
import android.widget.ListView;
import android.widget.TextView;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
index 042fd48..606c86f 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
@@ -30,8 +30,6 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.res.ColorStateList;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.ColorDrawable;
@@ -47,6 +45,9 @@
import android.widget.SeekBar;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
index 7765c43..924da09 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
@@ -23,7 +23,6 @@
import android.app.Activity;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
@@ -34,6 +33,8 @@
import android.widget.AbsoluteLayout;
import android.widget.AbsoluteLayout.LayoutParams;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
index 9fe36a9..0faa547 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
@@ -20,7 +20,6 @@
import static org.junit.Assert.assertNotNull;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
@@ -29,6 +28,8 @@
import android.widget.AbsoluteLayout;
import android.widget.AbsoluteLayout.LayoutParams;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/widget/src/android/widget/cts/ActionMenuViewTest.java b/tests/tests/widget/src/android/widget/cts/ActionMenuViewTest.java
index 95d8731..36b13d2 100644
--- a/tests/tests/widget/src/android/widget/cts/ActionMenuViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ActionMenuViewTest.java
@@ -25,7 +25,6 @@
import static org.mockito.Mockito.verify;
import android.app.Instrumentation;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.support.test.InstrumentationRegistry;
@@ -37,6 +36,8 @@
import android.widget.ActionMenuView;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java b/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
index 79ceb21..f7fc033 100644
--- a/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
@@ -34,7 +34,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.os.Parcelable;
import android.provider.Settings;
import android.support.test.filters.SmallTest;
@@ -54,6 +53,8 @@
import android.widget.ListAdapter;
import android.widget.ListView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
index 8eb72dd..5b969d3 100644
--- a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
@@ -16,7 +16,7 @@
package android.widget.cts;
-import static android.cts.util.WidgetTestUtils.sameCharSequence;
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -43,7 +43,6 @@
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.cts.util.PollingCheck;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
@@ -69,6 +68,8 @@
import android.widget.Filterable;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java b/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java
index 1ff3d08..670b4f8 100644
--- a/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java
@@ -28,7 +28,6 @@
import android.annotation.ColorInt;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.graphics.Rect;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
@@ -40,6 +39,8 @@
import android.widget.ScrollView;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java b/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java
index beae061..cd265f9 100644
--- a/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java
@@ -26,7 +26,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
@@ -35,6 +34,8 @@
import android.text.TextUtils;
import android.widget.CheckBox;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java b/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
index 4562661..da31c2d 100644
--- a/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
@@ -25,7 +25,6 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.res.ColorStateList;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.PorterDuff;
@@ -46,6 +45,8 @@
import android.widget.ListView;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
index efda31d..ff36bbd 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
@@ -26,8 +26,6 @@
import android.content.Context;
import android.content.res.Resources.Theme;
-import android.cts.util.PollingCheck;
-import android.cts.util.TestThread;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.DataSetObserver;
@@ -45,6 +43,9 @@
import android.widget.FilterQueryProvider;
import android.widget.TextView;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.TestThread;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java b/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
index 1ea26f8..f7f6bc7 100644
--- a/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
@@ -16,7 +16,7 @@
package android.widget.cts;
-import static android.cts.util.WidgetTestUtils.sameCharSequence;
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -30,8 +30,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.PollingCheck;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
@@ -46,6 +44,9 @@
import android.widget.EditText;
import android.widget.RelativeLayout;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java b/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java
index 9cd9f7a..296f03f 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java
@@ -17,16 +17,15 @@
package android.widget.cts;
import android.app.Instrumentation;
-import android.cts.util.CtsKeyEventUtil;
import android.support.test.InstrumentationRegistry;
-import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
import android.view.View;
import android.widget.ExpandableListAdapter;
import android.widget.ExpandableListView;
-import android.widget.cts.util.ExpandableListScenario;
import android.widget.cts.util.ListUtil;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
import junit.framework.Assert;
public class ExpandableListTester {
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
index 0a782d3..1f4270c 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
@@ -21,8 +21,6 @@
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.PollingCheck;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
@@ -35,6 +33,9 @@
import android.widget.cts.util.ExpandableListScenario.MyGroup;
import android.widget.cts.util.ListUtil;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
index f05621d..796073f 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
@@ -33,7 +33,6 @@
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.database.DataSetObserver;
import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable;
@@ -55,6 +54,8 @@
import android.widget.TextView;
import android.widget.cts.util.ExpandableListScenario;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
index 110549d..77cf1b6 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
@@ -21,8 +21,6 @@
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.PollingCheck;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.filters.MediumTest;
@@ -32,6 +30,9 @@
import android.widget.ExpandableListView;
import android.widget.cts.util.ListUtil;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/FilterTest.java b/tests/tests/widget/src/android/widget/cts/FilterTest.java
index 793aaa9..f8f577e 100644
--- a/tests/tests/widget/src/android/widget/cts/FilterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FilterTest.java
@@ -16,7 +16,7 @@
package android.widget.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@@ -25,8 +25,6 @@
import static org.mockito.Mockito.verify;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
-import android.cts.util.TestThread;
import android.os.Looper;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
@@ -34,6 +32,9 @@
import android.support.test.runner.AndroidJUnit4;
import android.widget.Filter;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.TestThread;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java b/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
index 602dda6..ee321e4 100644
--- a/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
@@ -33,8 +33,6 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.res.ColorStateList;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.Rect;
@@ -58,6 +56,9 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java
index d5e9028..0aca2cd 100644
--- a/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java
@@ -19,7 +19,6 @@
import static org.junit.Assert.assertEquals;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
@@ -31,6 +30,8 @@
import android.widget.FrameLayout;
import android.widget.FrameLayout.LayoutParams;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/widget/src/android/widget/cts/GalleryTest.java b/tests/tests/widget/src/android/widget/cts/GalleryTest.java
index 69d725e..acbe1e7 100644
--- a/tests/tests/widget/src/android/widget/cts/GalleryTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GalleryTest.java
@@ -24,7 +24,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Rect;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
@@ -47,6 +46,8 @@
import android.widget.Gallery;
import android.widget.ImageView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java
index afbbc4f..61c447b 100644
--- a/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java
@@ -18,12 +18,13 @@
import android.content.Context;
import android.content.res.XmlResourceParser;
-import android.cts.util.WidgetTestUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.widget.Gallery;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/tests/tests/widget/src/android/widget/cts/GridViewTest.java b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
index d362f30..810e1d9 100644
--- a/tests/tests/widget/src/android/widget/cts/GridViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
@@ -35,9 +35,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.database.DataSetObservable;
import android.database.DataSetObserver;
import android.graphics.Rect;
@@ -64,6 +61,10 @@
import android.widget.ImageView;
import android.widget.ListAdapter;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
index 3e569b6..88aa357 100644
--- a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
@@ -28,8 +28,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Rect;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
@@ -45,6 +43,9 @@
import android.widget.HorizontalScrollView;
import android.widget.TextView;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java b/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
index ca9cb0f..ea79796 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
@@ -24,7 +24,6 @@
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
@@ -38,6 +37,8 @@
import android.widget.ImageSwitcher;
import android.widget.ImageView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
index ffcaa85..2b55ed5 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
@@ -36,7 +36,6 @@
import android.app.Activity;
import android.content.Context;
import android.content.res.ColorStateList;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@@ -60,6 +59,8 @@
import android.widget.ImageView.ScaleType;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java b/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
index 50ef54f..91d3ebc 100644
--- a/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
@@ -29,7 +29,6 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
@@ -53,6 +52,8 @@
import android.widget.TextView;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
index 3d0d02e..b5ad7bd 100644
--- a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
@@ -35,9 +35,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
@@ -61,6 +58,10 @@
import android.widget.PopupWindow;
import android.widget.TextView;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/widget/src/android/widget/cts/ListViewTest.java b/tests/tests/widget/src/android/widget/cts/ListViewTest.java
index 0876138..4b1e6bb 100644
--- a/tests/tests/widget/src/android/widget/cts/ListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ListViewTest.java
@@ -39,9 +39,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Rect;
@@ -73,6 +70,10 @@
import android.widget.TextView;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import junit.framework.Assert;
import org.junit.Before;
diff --git a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
index b0dd82b..386c3d9 100644
--- a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
@@ -24,7 +24,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.MediumTest;
@@ -37,6 +36,8 @@
import android.widget.MediaController;
import android.widget.VideoView;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/NumberPickerTest.java b/tests/tests/widget/src/android/widget/cts/NumberPickerTest.java
index dfcb0f3..4d25740 100644
--- a/tests/tests/widget/src/android/widget/cts/NumberPickerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/NumberPickerTest.java
@@ -28,7 +28,6 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
@@ -37,6 +36,8 @@
import android.text.TextUtils;
import android.widget.NumberPicker;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/PointerIconTest.java b/tests/tests/widget/src/android/widget/cts/PointerIconTest.java
index 32d07a6..fe985b2 100644
--- a/tests/tests/widget/src/android/widget/cts/PointerIconTest.java
+++ b/tests/tests/widget/src/android/widget/cts/PointerIconTest.java
@@ -19,7 +19,6 @@
import static org.junit.Assert.assertEquals;
import android.app.Activity;
-import android.cts.util.WidgetTestUtils;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
@@ -31,6 +30,8 @@
import android.widget.TabWidget;
import android.widget.TextView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java b/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java
index 17508a3..daae02d 100644
--- a/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java
+++ b/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java
@@ -27,7 +27,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.MediumTest;
@@ -42,6 +41,8 @@
import android.widget.EditText;
import android.widget.PopupMenu;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java b/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
index 65c2b95..2daa6ea 100644
--- a/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
@@ -26,7 +26,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
@@ -35,6 +34,8 @@
import android.text.TextUtils;
import android.widget.RadioButton;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java b/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java
index 10c0dd4..5c92e66 100644
--- a/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java
@@ -20,7 +20,6 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
import android.os.Parcel;
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
@@ -30,6 +29,8 @@
import android.view.ViewGroup;
import android.widget.RemoteViews;
+import com.android.compatibility.common.util.NullWebViewUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java b/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java
index 475dafe..f8b9994 100644
--- a/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java
@@ -30,7 +30,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
@@ -75,6 +74,8 @@
import android.widget.ViewFlipper;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViewsWidgetTest.java b/tests/tests/widget/src/android/widget/cts/RemoteViewsWidgetTest.java
index 9a8a04a..9c47e69 100644
--- a/tests/tests/widget/src/android/widget/cts/RemoteViewsWidgetTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViewsWidgetTest.java
@@ -35,8 +35,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
-import android.cts.util.SystemUtil;
import android.os.Bundle;
import android.os.Process;
import android.support.test.InstrumentationRegistry;
@@ -54,6 +52,9 @@
import android.widget.cts.appwidget.MyAppWidgetProvider;
import android.widget.cts.appwidget.MyAppWidgetService;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.SystemUtil;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
index cae1d30..3abb023 100644
--- a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
@@ -28,7 +28,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.graphics.Rect;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
@@ -45,6 +44,8 @@
import android.widget.TextView;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/SearchView_CursorTest.java b/tests/tests/widget/src/android/widget/cts/SearchView_CursorTest.java
index c4baead..b1523c5 100644
--- a/tests/tests/widget/src/android/widget/cts/SearchView_CursorTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SearchView_CursorTest.java
@@ -28,8 +28,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.provider.BaseColumns;
@@ -43,6 +41,9 @@
import android.widget.SearchView;
import android.widget.SimpleCursorAdapter;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
index 7f59978..3c388fc 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
@@ -33,7 +33,6 @@
import android.content.Context;
import android.content.res.Resources.Theme;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.support.test.InstrumentationRegistry;
@@ -48,6 +47,8 @@
import android.widget.TextView;
import android.widget.TwoLineListItem;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
index 365b5f0..880da98 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
@@ -31,7 +31,6 @@
import static org.mockito.Mockito.verify;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.graphics.Bitmap;
@@ -48,6 +47,8 @@
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
index 2a0636d..fefd261 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.fail;
import android.content.Context;
-import android.cts.util.WidgetTestUtils;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.graphics.Bitmap;
@@ -35,6 +34,8 @@
import android.widget.SimpleCursorTreeAdapter;
import android.widget.TextView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
index e9b726a..1993244 100644
--- a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
@@ -16,7 +16,7 @@
package android.widget.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,7 +31,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.MediumTest;
@@ -44,6 +43,8 @@
import android.widget.SlidingDrawer;
import android.widget.TextView;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/SpinnerTest.java b/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
index af71b71..9aebd71 100644
--- a/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
@@ -32,8 +32,6 @@
import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
import android.content.res.Resources.Theme;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.support.test.InstrumentationRegistry;
@@ -49,6 +47,9 @@
import android.widget.Spinner;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/SwitchTest.java b/tests/tests/widget/src/android/widget/cts/SwitchTest.java
index 6faf9c6..1123a4e 100644
--- a/tests/tests/widget/src/android/widget/cts/SwitchTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SwitchTest.java
@@ -24,7 +24,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.res.ColorStateList;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.PorterDuff.Mode;
import android.graphics.Rect;
@@ -40,6 +39,8 @@
import android.widget.Switch;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/TabHostTest.java b/tests/tests/widget/src/android/widget/cts/TabHostTest.java
index d4b7aba..765fd37 100644
--- a/tests/tests/widget/src/android/widget/cts/TabHostTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TabHostTest.java
@@ -30,7 +30,6 @@
import android.app.ActivityGroup;
import android.app.Instrumentation;
import android.content.Intent;
-import android.cts.util.WidgetTestUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
@@ -43,6 +42,8 @@
import android.widget.TabHost.TabSpec;
import android.widget.TextView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java b/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
index 92bd7b6..7c7b892 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
@@ -30,7 +30,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
@@ -38,6 +37,8 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index 074d4fa..f05dd82 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -48,10 +48,6 @@
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.CtsTouchUtils;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Path;
@@ -143,6 +139,11 @@
import android.widget.TextView.BufferType;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/TimePickerTest.java b/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
index c99c5eb..7f5d3e3 100644
--- a/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
@@ -29,8 +29,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.CtsKeyEventUtil;
-import android.cts.util.CtsTouchUtils;
import android.os.Parcelable;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
@@ -42,6 +40,9 @@
import android.view.View;
import android.widget.TimePicker;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ToastTest.java b/tests/tests/widget/src/android/widget/cts/ToastTest.java
index 3c94530..f2426e8 100644
--- a/tests/tests/widget/src/android/widget/cts/ToastTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToastTest.java
@@ -25,7 +25,6 @@
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.PollingCheck;
import android.graphics.drawable.Drawable;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
@@ -40,6 +39,8 @@
import android.widget.ImageView;
import android.widget.Toast;
+import com.android.compatibility.common.util.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ToolbarTest.java b/tests/tests/widget/src/android/widget/cts/ToolbarTest.java
index d8643d5..f341d8b 100644
--- a/tests/tests/widget/src/android/widget/cts/ToolbarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToolbarTest.java
@@ -27,7 +27,6 @@
import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.app.Instrumentation;
-import android.cts.util.WidgetTestUtils;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.support.test.InstrumentationRegistry;
@@ -41,6 +40,8 @@
import android.widget.Toolbar;
import android.widget.cts.util.TestUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
index 7f11354..78eebf4 100644
--- a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
@@ -16,7 +16,7 @@
package android.widget.cts;
-import static android.cts.util.CtsMockitoUtils.within;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -31,7 +31,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.cts.util.MediaUtils;
import android.media.MediaPlayer;
import android.os.SystemClock;
import android.support.test.InstrumentationRegistry;
@@ -44,6 +43,8 @@
import android.widget.MediaController;
import android.widget.VideoView;
+import com.android.compatibility.common.util.MediaUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
index 6178aa4..84eba18 100644
--- a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
@@ -22,7 +22,6 @@
import android.app.Activity;
import android.app.Instrumentation;
-import android.cts.util.CtsTouchUtils;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.LargeTest;
@@ -36,6 +35,8 @@
import android.widget.ListView;
import android.widget.ZoomButton;
+import com.android.compatibility.common.util.CtsTouchUtils;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetProvider.java b/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetProvider.java
index fd89cf1..a0711e2 100644
--- a/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetProvider.java
+++ b/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetProvider.java
@@ -21,7 +21,6 @@
import android.appwidget.AppWidgetProvider;
import android.content.Context;
import android.content.Intent;
-import android.cts.util.PollingCheck;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
@@ -29,6 +28,8 @@
import android.widget.RemoteViews;
import android.widget.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
+
import java.util.concurrent.CountDownLatch;
public final class MyAppWidgetProvider extends AppWidgetProvider {
diff --git a/tests/tests/widget/src/android/widget/cts/util/TestUtils.java b/tests/tests/widget/src/android/widget/cts/util/TestUtils.java
index 3efb5b0..e70b4c2 100644
--- a/tests/tests/widget/src/android/widget/cts/util/TestUtils.java
+++ b/tests/tests/widget/src/android/widget/cts/util/TestUtils.java
@@ -16,13 +16,14 @@
package android.widget.cts.util;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.argThat;
+
import android.annotation.ColorInt;
import android.annotation.DrawableRes;
import android.annotation.NonNull;
import android.content.Context;
import android.content.res.ColorStateList;
-import android.cts.util.WidgetTestUtils;
-import android.cts.util.Within;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -35,19 +36,17 @@
import android.view.ViewParent;
import android.widget.TextView;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
import junit.framework.Assert;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
-import org.mockito.verification.VerificationMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.argThat;
-
public class TestUtils {
/**
* This method takes a view and returns a single bitmap that is the layered combination
@@ -487,4 +486,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/tvprovider/Android.mk b/tests/tvprovider/Android.mk
index 1b90a79..2ac45a2 100644
--- a/tests/tvprovider/Android.mk
+++ b/tests/tvprovider/Android.mk
@@ -18,7 +18,7 @@
# don't include this package in any target
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java b/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
index 411bd24..e9c7ae0 100644
--- a/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
+++ b/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
@@ -24,7 +24,6 @@
import android.content.ContentValues;
import android.content.OperationApplicationException;
import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
import android.database.Cursor;
import android.media.tv.TvContract;
import android.media.tv.TvContract.Channels;
@@ -32,6 +31,7 @@
import android.net.Uri;
import android.os.RemoteException;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
import com.android.compatibility.common.util.MeasureRun;
import com.android.compatibility.common.util.MeasureTime;
diff --git a/tests/ui/Android.mk b/tests/ui/Android.mk
index 3d13489..0ad32d1 100644
--- a/tests/ui/Android.mk
+++ b/tests/ui/Android.mk
@@ -20,7 +20,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/video/Android.mk b/tests/video/Android.mk
index 5348731..d7b91d9 100644
--- a/tests/video/Android.mk
+++ b/tests/video/Android.mk
@@ -23,7 +23,7 @@
# include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
-LOCAL_STATIC_JAVA_LIBRARIES := ctsmediautil ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := ctsmediautil compatibility-device-util ctstestrunner
LOCAL_JNI_SHARED_LIBRARIES := libctsmediacodec_jni libnativehelper_compat_libc++
diff --git a/tests/video/src/android/video/cts/CodecInfo.java b/tests/video/src/android/video/cts/CodecInfo.java
index e1ed78f..4309a96 100644
--- a/tests/video/src/android/video/cts/CodecInfo.java
+++ b/tests/video/src/android/video/cts/CodecInfo.java
@@ -16,7 +16,7 @@
package android.video.cts;
-import android.cts.util.MediaUtils;
+import com.android.compatibility.common.util.MediaUtils;
import android.media.MediaCodec;
import android.media.MediaCodecInfo;
diff --git a/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java b/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java
index 9bd1fcf..7b1dc11 100644
--- a/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java
+++ b/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java
@@ -16,8 +16,6 @@
package android.video.cts;
-import android.cts.util.MediaPerfUtils;
-import android.cts.util.MediaUtils;
import android.graphics.ImageFormat;
import android.graphics.Point;
import android.media.Image;
@@ -34,8 +32,10 @@
import android.util.Pair;
import android.util.Range;
-import android.cts.util.CtsAndroidTestCase;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.MediaPerfUtils;
+import com.android.compatibility.common.util.MediaUtils;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
import com.android.compatibility.common.util.Stat;