Refactor the Jetpack test utils
Refactor the Jetpack test utils so that we can reuse it to get the
info from the WindowManager Jetpack library for the EDI.
Bug: 168732027
Test: atest CtsWindowManagerJetpackTestCases:ExtensionTest
Change-Id: I0b0f1c0b1b6b79e467fd9e4c094b4ed86ea6a993
diff --git a/tests/framework/base/windowmanager/jetpack/Android.bp b/tests/framework/base/windowmanager/jetpack/Android.bp
index 7d03ff4..380c3d5 100644
--- a/tests/framework/base/windowmanager/jetpack/Android.bp
+++ b/tests/framework/base/windowmanager/jetpack/Android.bp
@@ -42,6 +42,21 @@
installable: false,
}
+java_library {
+ name: "cts_window_jetpack_utils",
+ srcs: [
+ "src/android/server/wm/jetpack/utils/**/*.java"
+ ],
+ static_libs: [
+ "compatibility-device-util-axt",
+ ],
+ libs: [
+ "cts_window-extensions",
+ "cts_window-sidecar",
+ ],
+ sdk_version: "test_current",
+}
+
android_test {
name: "CtsWindowManagerJetpackTestCases",
defaults: ["cts_defaults"],
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionTest.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionTest.java
index 0686443..2552686 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionTest.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionTest.java
@@ -16,7 +16,7 @@
package android.server.wm.jetpack;
-import static android.server.wm.jetpack.ExtensionUtils.assertEqualsState;
+import static android.server.wm.jetpack.utils.ExtensionUtils.assertEqualsState;
import static com.google.common.truth.Truth.assertThat;
@@ -26,10 +26,11 @@
import android.content.pm.ActivityInfo;
import android.graphics.Rect;
import android.os.IBinder;
-import android.server.wm.jetpack.wrapper.TestDeviceState;
-import android.server.wm.jetpack.wrapper.TestDisplayFeature;
-import android.server.wm.jetpack.wrapper.TestInterfaceCompat;
-import android.server.wm.jetpack.wrapper.TestWindowLayoutInfo;
+import android.server.wm.jetpack.utils.ExtensionUtils;
+import android.server.wm.jetpack.utils.wrapper.TestDeviceState;
+import android.server.wm.jetpack.utils.wrapper.TestDisplayFeature;
+import android.server.wm.jetpack.utils.wrapper.TestInterfaceCompat;
+import android.server.wm.jetpack.utils.wrapper.TestWindowLayoutInfo;
import androidx.annotation.NonNull;
import androidx.test.ext.junit.runners.AndroidJUnit4;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/TestGetWindowLayoutInfoActivity.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/TestGetWindowLayoutInfoActivity.java
index e9f6c66..679dba6 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/TestGetWindowLayoutInfoActivity.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/TestGetWindowLayoutInfoActivity.java
@@ -22,16 +22,17 @@
import android.os.Bundle;
import android.os.IBinder;
-import android.server.wm.jetpack.wrapper.TestInterfaceCompat;
-import android.server.wm.jetpack.wrapper.TestWindowLayoutInfo;
+import android.server.wm.jetpack.utils.ExtensionUtils;
+import android.server.wm.jetpack.utils.wrapper.TestInterfaceCompat;
+import android.server.wm.jetpack.utils.wrapper.TestWindowLayoutInfo;
import android.view.View;
import androidx.annotation.Nullable;
/**
* Activity that can verify the return value of
- * {@link android.server.wm.jetpack.wrapper.TestInterfaceCompat#getWindowLayoutInfo(IBinder)} on
- * activity's different states.
+ * {@link android.server.wm.jetpack.utils.wrapper.TestInterfaceCompat#getWindowLayoutInfo(IBinder)}
+ * on activity's different states.
*/
public class TestGetWindowLayoutInfoActivity extends TestActivity {
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionUtils.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ExtensionUtils.java
similarity index 85%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionUtils.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ExtensionUtils.java
index 1aef84e..987cf26 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionUtils.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ExtensionUtils.java
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package android.server.wm.jetpack;
+package android.server.wm.jetpack.utils;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assume.assumeFalse;
import android.content.Context;
-import android.server.wm.jetpack.wrapper.TestDeviceState;
-import android.server.wm.jetpack.wrapper.extensionwrapperimpl.TestExtensionCompat;
-import android.server.wm.jetpack.wrapper.sidecarwrapperimpl.TestSidecarCompat;
-import android.server.wm.jetpack.wrapper.TestInterfaceCompat;
-import android.server.wm.jetpack.wrapper.sidecarwrapperimpl.TestSidecarDeviceState;
+import android.server.wm.jetpack.utils.wrapper.TestDeviceState;
+import android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl.TestExtensionCompat;
+import android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl.TestSidecarCompat;
+import android.server.wm.jetpack.utils.wrapper.TestInterfaceCompat;
+import android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl.TestSidecarDeviceState;
import android.text.TextUtils;
import android.util.Log;
@@ -34,16 +34,16 @@
import androidx.window.sidecar.SidecarProvider;
/** Helper class to get the vendor provided Extension/Sidecar implementation. */
-final class ExtensionUtils {
+public final class ExtensionUtils {
private static final String TAG = "TestInterfaceProvider";
/** Skips devices that don't implement the wm extension library. */
- static void assumeSupportedDevice(Context context) {
+ public static void assumeSupportedDevice(Context context) {
assumeFalse(TextUtils.isEmpty(getVersion()) && getInterfaceCompat(context) == null);
}
/** Asserts that the vendor provided version is in the correct format and range. */
- static void assertValidVersion() {
+ public static void assertValidVersion() {
if (getExtensionVersion() != null) {
String versionStr = getExtensionVersion();
assertThat(Version.isValidVersion(versionStr)).isTrue();
@@ -55,7 +55,7 @@
}
}
- static void assertEqualsState(TestDeviceState left, TestDeviceState right) {
+ public static void assertEqualsState(TestDeviceState left, TestDeviceState right) {
if (left instanceof TestSidecarDeviceState && right instanceof TestSidecarDeviceState) {
assertThat(left.getPosture()).isEqualTo(right.getPosture());
} else {
@@ -68,7 +68,7 @@
* Sidecar implementation (deprecated). If neither is available, returns {@code null}.
*/
@Nullable
- static TestInterfaceCompat getInterfaceCompat(Context context) {
+ public static TestInterfaceCompat getInterfaceCompat(Context context) {
// TODO(b/158876142) Reinstate android.window.extension
if (!TextUtils.isEmpty(getSidecarVersion())) {
return getSidecarInterfaceCompat(context);
@@ -77,7 +77,7 @@
}
@Nullable
- private static String getVersion() {
+ public static String getVersion() {
if (!TextUtils.isEmpty(getExtensionVersion())) {
return getExtensionVersion();
} else if (!TextUtils.isEmpty(getSidecarVersion())) {
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/Version.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/Version.java
similarity index 98%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/Version.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/Version.java
index a9978c0..c95f090 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/Version.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/Version.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.server.wm.jetpack;
+package android.server.wm.jetpack.utils;
import android.text.TextUtils;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestDeviceState.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestDeviceState.java
similarity index 74%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestDeviceState.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestDeviceState.java
index 499b4da..7b4e386 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestDeviceState.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestDeviceState.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper;
+package android.server.wm.jetpack.utils.wrapper;
import androidx.annotation.IntDef;
@@ -25,17 +25,17 @@
* Test interface for {@link androidx.window.extensions.ExtensionDeviceState} and
* {@link androidx.window.sidecar.SidecarDeviceState} that serves as an API compatibility wrapper.
*
- * @see android.server.wm.jetpack.wrapper.extensionwrapperimpl.TestExtensionDeviceState
- * @see android.server.wm.jetpack.wrapper.sidecarwrapperimpl.TestSidecarDeviceState
+ * @see android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl.TestExtensionDeviceState
+ * @see android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl.TestSidecarDeviceState
*/
public interface TestDeviceState {
/** Copied from {@link androidx.window.extensions.ExtensionDeviceState}. */
- public static final int POSTURE_UNKNOWN = 0;
- public static final int POSTURE_CLOSED = 1;
- public static final int POSTURE_HALF_OPENED = 2;
- public static final int POSTURE_OPENED = 3;
- public static final int POSTURE_FLIPPED = 4;
+ int POSTURE_UNKNOWN = 0;
+ int POSTURE_CLOSED = 1;
+ int POSTURE_HALF_OPENED = 2;
+ int POSTURE_OPENED = 3;
+ int POSTURE_FLIPPED = 4;
@Retention(RetentionPolicy.SOURCE)
@IntDef({
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestDisplayFeature.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestDisplayFeature.java
similarity index 82%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestDisplayFeature.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestDisplayFeature.java
index 8eb0774..c31c2be 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestDisplayFeature.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestDisplayFeature.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper;
+package android.server.wm.jetpack.utils.wrapper;
import android.graphics.Rect;
@@ -28,20 +28,20 @@
* {@link androidx.window.sidecar.SidecarDisplayFeature} that serves as an API compatibility
* wrapper.
*
- * @see android.server.wm.jetpack.wrapper.extensionwrapperimpl.TestExtensionDisplayFeature
- * @see android.server.wm.jetpack.wrapper.sidecarwrapperimpl.TestSidecarDisplayFeature
+ * @see android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl.TestExtensionDisplayFeature
+ * @see android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl.TestSidecarDisplayFeature
*/
public interface TestDisplayFeature {
/**
* A fold in the flexible screen without a physical gap.
*/
- public static final int TYPE_FOLD = 1;
+ int TYPE_FOLD = 1;
/**
* A physical separation with a hinge that allows two display panels to fold.
*/
- public static final int TYPE_HINGE = 2;
+ int TYPE_HINGE = 2;
@Retention(RetentionPolicy.SOURCE)
@IntDef({
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestInterfaceCompat.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestInterfaceCompat.java
similarity index 92%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestInterfaceCompat.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestInterfaceCompat.java
index 749d8c5..8a4d516 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestInterfaceCompat.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestInterfaceCompat.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper;
+package android.server.wm.jetpack.utils.wrapper;
import android.os.IBinder;
-import android.server.wm.jetpack.wrapper.extensionwrapperimpl.TestExtensionCompat;
-import android.server.wm.jetpack.wrapper.sidecarwrapperimpl.TestSidecarCompat;
+import android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl.TestExtensionCompat;
+import android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl.TestSidecarCompat;
import androidx.annotation.NonNull;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestWindowLayoutInfo.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestWindowLayoutInfo.java
similarity index 81%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestWindowLayoutInfo.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestWindowLayoutInfo.java
index 5e4621d..7235346 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/TestWindowLayoutInfo.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/TestWindowLayoutInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper;
+package android.server.wm.jetpack.utils.wrapper;
import androidx.annotation.Nullable;
@@ -25,8 +25,8 @@
* {@link androidx.window.sidecar.SidecarWindowLayoutInfo} that serves as an API compatibility
* wrapper.
*
- * @see android.server.wm.jetpack.wrapper.extensionwrapperimpl.TestExtensionWindowLayoutInfo
- * @see android.server.wm.jetpack.wrapper.sidecarwrapperimpl.TestSidecarWindowLayoutInfo
+ * @see android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl.TestExtensionWindowLayoutInfo
+ * @see android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl.TestSidecarWindowLayoutInfo
*/
public interface TestWindowLayoutInfo {
/** Gets the list of display features present within the window. */
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionCompat.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionCompat.java
similarity index 91%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionCompat.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionCompat.java
index 3f4d72d..e66dc39 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionCompat.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionCompat.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.extensionwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl;
import android.os.IBinder;
-import android.server.wm.jetpack.wrapper.TestDeviceState;
-import android.server.wm.jetpack.wrapper.TestInterfaceCompat;
-import android.server.wm.jetpack.wrapper.TestWindowLayoutInfo;
+import android.server.wm.jetpack.utils.wrapper.TestDeviceState;
+import android.server.wm.jetpack.utils.wrapper.TestInterfaceCompat;
+import android.server.wm.jetpack.utils.wrapper.TestWindowLayoutInfo;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionDeviceState.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionDeviceState.java
similarity index 93%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionDeviceState.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionDeviceState.java
index 60362b4..f764564 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionDeviceState.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionDeviceState.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.extensionwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl;
-import android.server.wm.jetpack.wrapper.TestDeviceState;
+import android.server.wm.jetpack.utils.wrapper.TestDeviceState;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionDisplayFeature.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionDisplayFeature.java
similarity index 94%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionDisplayFeature.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionDisplayFeature.java
index abc7d4d..a0ce233 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionDisplayFeature.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionDisplayFeature.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.extensionwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl;
import android.graphics.Rect;
-import android.server.wm.jetpack.wrapper.TestDisplayFeature;
+import android.server.wm.jetpack.utils.wrapper.TestDisplayFeature;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionWindowLayoutInfo.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionWindowLayoutInfo.java
similarity index 92%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionWindowLayoutInfo.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionWindowLayoutInfo.java
index e31a29d..89d5e95 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/extensionwrapperimpl/TestExtensionWindowLayoutInfo.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/extensionwrapperimpl/TestExtensionWindowLayoutInfo.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.extensionwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.extensionwrapperimpl;
-import android.server.wm.jetpack.wrapper.TestDisplayFeature;
-import android.server.wm.jetpack.wrapper.TestWindowLayoutInfo;
+import android.server.wm.jetpack.utils.wrapper.TestDisplayFeature;
+import android.server.wm.jetpack.utils.wrapper.TestWindowLayoutInfo;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarCompat.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarCompat.java
similarity index 91%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarCompat.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarCompat.java
index 47b09e2..5eec289 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarCompat.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarCompat.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.sidecarwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl;
import android.os.IBinder;
-import android.server.wm.jetpack.wrapper.TestDeviceState;
-import android.server.wm.jetpack.wrapper.TestInterfaceCompat;
-import android.server.wm.jetpack.wrapper.TestWindowLayoutInfo;
+import android.server.wm.jetpack.utils.wrapper.TestDeviceState;
+import android.server.wm.jetpack.utils.wrapper.TestInterfaceCompat;
+import android.server.wm.jetpack.utils.wrapper.TestWindowLayoutInfo;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarDeviceState.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarDeviceState.java
similarity index 93%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarDeviceState.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarDeviceState.java
index 76e920a..f04deb8 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarDeviceState.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarDeviceState.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.sidecarwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl;
-import android.server.wm.jetpack.wrapper.TestDeviceState;
+import android.server.wm.jetpack.utils.wrapper.TestDeviceState;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarDisplayFeature.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarDisplayFeature.java
similarity index 94%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarDisplayFeature.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarDisplayFeature.java
index e94d15d..2437e9b 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarDisplayFeature.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarDisplayFeature.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.sidecarwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl;
import android.graphics.Rect;
-import android.server.wm.jetpack.wrapper.TestDisplayFeature;
+import android.server.wm.jetpack.utils.wrapper.TestDisplayFeature;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarWindowLayoutInfo.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarWindowLayoutInfo.java
similarity index 92%
rename from tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarWindowLayoutInfo.java
rename to tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarWindowLayoutInfo.java
index 163e0b6..e784351 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/wrapper/sidecarwrapperimpl/TestSidecarWindowLayoutInfo.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/wrapper/sidecarwrapperimpl/TestSidecarWindowLayoutInfo.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package android.server.wm.jetpack.wrapper.sidecarwrapperimpl;
+package android.server.wm.jetpack.utils.wrapper.sidecarwrapperimpl;
-import android.server.wm.jetpack.wrapper.TestDisplayFeature;
-import android.server.wm.jetpack.wrapper.TestWindowLayoutInfo;
+import android.server.wm.jetpack.utils.wrapper.TestDisplayFeature;
+import android.server.wm.jetpack.utils.wrapper.TestWindowLayoutInfo;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;