Merge "Undo hard-coding of READ_PRIVILEGED_PHONE_STATE"
diff --git a/apps/CrossProfileTestApp/Android.bp b/apps/CrossProfileTestApp/Android.bp
index 628f8b6..71e0acc 100644
--- a/apps/CrossProfileTestApp/Android.bp
+++ b/apps/CrossProfileTestApp/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
index a233250..b1ce20e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
@@ -111,6 +111,9 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ if (mDeviceSuspendLock != null && mDeviceSuspendLock.isHeld()) {
+ mDeviceSuspendLock.release();
+ }
if (mScreenManipulator != null) {
mScreenManipulator.releaseScreenOn();
mScreenManipulator.close();
diff --git a/apps/EmptyDeviceAdmin/Android.bp b/apps/EmptyDeviceAdmin/Android.bp
index 0844a12..35d2343 100644
--- a/apps/EmptyDeviceAdmin/Android.bp
+++ b/apps/EmptyDeviceAdmin/Android.bp
@@ -21,7 +21,6 @@
min_sdk_version: "12",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/apps/EmptyDeviceOwner/Android.bp b/apps/EmptyDeviceOwner/Android.bp
index 9bcf955..44ea769 100644
--- a/apps/EmptyDeviceOwner/Android.bp
+++ b/apps/EmptyDeviceOwner/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/apps/ForceStopHelperApp/Android.bp b/apps/ForceStopHelperApp/Android.bp
index e843edc..f438b87 100644
--- a/apps/ForceStopHelperApp/Android.bp
+++ b/apps/ForceStopHelperApp/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/apps/OomCatcher/Android.bp b/apps/OomCatcher/Android.bp
index a22df60..97d8180 100644
--- a/apps/OomCatcher/Android.bp
+++ b/apps/OomCatcher/Android.bp
@@ -22,6 +22,5 @@
test_suites: [
"cts",
"sts",
- "vts10",
],
}
diff --git a/apps/PermissionApp/Android.bp b/apps/PermissionApp/Android.bp
index e8f163c..53381d7 100644
--- a/apps/PermissionApp/Android.bp
+++ b/apps/PermissionApp/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/apps/VpnApp/Android.bp b/apps/VpnApp/Android.bp
index 4b45b00..64e94fc 100644
--- a/apps/VpnApp/Android.bp
+++ b/apps/VpnApp/Android.bp
@@ -25,7 +25,6 @@
manifest: "api23/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -36,7 +35,6 @@
manifest: "api24/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -47,7 +45,6 @@
manifest: "latest/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -58,7 +55,6 @@
manifest: "notalwayson/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/apps/hotspot/Android.mk b/apps/hotspot/Android.mk
index 6730fcc..134734e 100644
--- a/apps/hotspot/Android.mk
+++ b/apps/hotspot/Android.mk
@@ -13,6 +13,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-LOCAL_COMPATIBILITY_SUITE := cts sts vts10
+LOCAL_COMPATIBILITY_SUITE := cts sts
include $(BUILD_CTS_PACKAGE)
diff --git a/build/device_info_package.mk b/build/device_info_package.mk
index 09e062e..a79e848 100644
--- a/build/device_info_package.mk
+++ b/build/device_info_package.mk
@@ -19,6 +19,8 @@
DEVICE_INFO_PACKAGE := com.android.compatibility.common.deviceinfo
DEVICE_INFO_INSTRUMENT := androidx.test.runner.AndroidJUnitRunner
DEVICE_INFO_USES_LIBRARY := android.test.runner
+DEVICE_INFO_USES_OPTIONAL_LIBRARIES := \
+ androidx.window.sidecar
DEVICE_INFO_PERMISSIONS += \
android.permission.READ_PHONE_STATE \
android.permission.WRITE_EXTERNAL_STORAGE
@@ -39,7 +41,8 @@
$(DEVICE_INFO_PACKAGE).ScreenDeviceInfo \
$(DEVICE_INFO_PACKAGE).StorageDeviceInfo \
$(DEVICE_INFO_PACKAGE).UserDeviceInfo \
- $(DEVICE_INFO_PACKAGE).VintfDeviceInfo
+ $(DEVICE_INFO_PACKAGE).VintfDeviceInfo \
+ com.android.compatibility.common.util.DummyActivity
ifeq ($(DEVICE_INFO_MIN_SDK),)
DEVICE_INFO_MIN_SDK := 8
@@ -61,6 +64,7 @@
$(manifest_xml): PRIVATE_INFO_PERMISSIONS := $(foreach permission, $(DEVICE_INFO_PERMISSIONS),-r $(permission))
$(manifest_xml): PRIVATE_INFO_ACTIVITIES := $(foreach activity,$(DEVICE_INFO_ACTIVITIES),-a $(activity))
$(manifest_xml): PRIVATE_USES_LIBRARY := $(DEVICE_INFO_USES_LIBRARY)
+$(manifest_xml): PRIVATE_USES_OPTIONAL_LIBRARIES := $(foreach library,$(DEVICE_INFO_USES_OPTIONAL_LIBRARIES),-lo $(library))
$(manifest_xml): PRIVATE_PACKAGE := $(DEVICE_INFO_PACKAGE)
$(manifest_xml): PRIVATE_INSTRUMENT := $(DEVICE_INFO_INSTRUMENT)
$(manifest_xml): PRIVATE_MIN_SDK := $(DEVICE_INFO_MIN_SDK)
@@ -74,6 +78,7 @@
$(PRIVATE_INFO_PERMISSIONS) \
$(PRIVATE_INFO_ACTIVITIES) \
-l $(PRIVATE_USES_LIBRARY) \
+ $(PRIVATE_USES_OPTIONAL_LIBRARIES) \
-p $(PRIVATE_PACKAGE) \
-i $(PRIVATE_INSTRUMENT) \
-s $(PRIVATE_MIN_SDK) \
diff --git a/common/device-side/device-info/Android.bp b/common/device-side/device-info/Android.bp
index e62efd9..ad648c1 100644
--- a/common/device-side/device-info/Android.bp
+++ b/common/device-side/device-info/Android.bp
@@ -18,8 +18,9 @@
srcs: ["src/**/*.java"],
static_libs: [
- "compatibility-device-util-axt",
"androidx.test.rules",
+ "compatibility-device-util-axt",
+ "cts_window_jetpack_utils",
"junit",
],
diff --git a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/ScreenDeviceInfo.java b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/ScreenDeviceInfo.java
index dcd6f54..f77a164 100644
--- a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/ScreenDeviceInfo.java
+++ b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/ScreenDeviceInfo.java
@@ -15,13 +15,24 @@
*/
package com.android.compatibility.common.deviceinfo;
+import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.server.wm.jetpack.utils.ExtensionUtils;
+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 android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.WindowManager;
import com.android.compatibility.common.util.DeviceInfoStore;
+import com.android.compatibility.common.util.DummyActivity;
+
+import java.util.List;
/**
* Screen device info collector.
@@ -46,6 +57,38 @@
Configuration configuration = getContext().getResources().getConfiguration();
store.addResult("screen_size", getScreenSize(configuration));
store.addResult("smallest_screen_width_dp", configuration.smallestScreenWidthDp);
+
+ // WindowManager Jetpack Library version and available display features.
+ String wmJetpackVersion = ExtensionUtils.getVersion();
+ if (!TextUtils.isEmpty(wmJetpackVersion)) {
+ int[] displayFeatures = getDisplayFeatures();
+ store.addResult("wm_jetpack_version", wmJetpackVersion);
+ store.addArrayResult("display_features", displayFeatures);
+ }
+ }
+
+ private int[] getDisplayFeatures() {
+ final Activity activity = ScreenDeviceInfo.this.launchActivity(
+ "com.android.compatibility.common.deviceinfo",
+ DummyActivity.class,
+ new Bundle());
+ final IBinder windowToken = activity.getWindow().getAttributes().token;
+ final TestInterfaceCompat extension = ExtensionUtils.getInterfaceCompat(activity);
+ if (extension == null) {
+ return new int[0];
+ }
+
+ final TestWindowLayoutInfo windowLayoutInfo = extension.getWindowLayoutInfo(windowToken);
+ if (windowLayoutInfo == null) {
+ return new int[0];
+ }
+
+ List<TestDisplayFeature> displayFeatureList = windowLayoutInfo.getDisplayFeatures();
+ final int[] displayFeatures = new int[displayFeatureList.size()];
+ for (int i = 0; i < displayFeatureList.size(); i++) {
+ displayFeatures[i] = displayFeatureList.get(i).getType();
+ }
+ return displayFeatures;
}
private static String getScreenSize(Configuration configuration) {
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/MediaUtils.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/MediaUtils.java
index ffb66be..3f44317 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/MediaUtils.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/MediaUtils.java
@@ -572,6 +572,10 @@
return hasCodecsForResourceCombo(context, resourceId, ALL_AV_TRACKS, mimePrefix);
}
+ public static boolean hasCodecForResourceAndDomain(String resource, String mimePrefix) {
+ return hasCodecsForResourceCombo(resource, ALL_AV_TRACKS, mimePrefix);
+ }
+
/**
* return true iff all audio and video tracks are supported
*/
diff --git a/hostsidetests/abioverride/Android.bp b/hostsidetests/abioverride/Android.bp
index b287842..df1b040 100644
--- a/hostsidetests/abioverride/Android.bp
+++ b/hostsidetests/abioverride/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/abioverride/app/Android.bp b/hostsidetests/abioverride/app/Android.bp
index 2b6dfe4..7d32534 100644
--- a/hostsidetests/abioverride/app/Android.bp
+++ b/hostsidetests/abioverride/app/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/accounts/Android.bp b/hostsidetests/accounts/Android.bp
index 24c3591..12b0747 100644
--- a/hostsidetests/accounts/Android.bp
+++ b/hostsidetests/accounts/Android.bp
@@ -27,7 +27,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp b/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
index cc3ba95..95059f1 100644
--- a/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
+++ b/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/accounts/test-apps/Android.mk b/hostsidetests/accounts/test-apps/Android.mk
index 985ff13..0d4c793 100644
--- a/hostsidetests/accounts/test-apps/Android.mk
+++ b/hostsidetests/accounts/test-apps/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
# Build the test APKs using their own makefiles
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/adb/Android.mk b/hostsidetests/adb/Android.mk
index 292bc18..ea6eb03 100644
--- a/hostsidetests/adb/Android.mk
+++ b/hostsidetests/adb/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CTS_TEST_PACKAGE := android.host.adb
LOCAL_MODULE := CtsAdbHostTestCases
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
diff --git a/hostsidetests/angle/Android.bp b/hostsidetests/angle/Android.bp
index dac193f..a0faa3b 100644
--- a/hostsidetests/angle/Android.bp
+++ b/hostsidetests/angle/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/angle/app/driverTest/Android.bp b/hostsidetests/angle/app/driverTest/Android.bp
index 9b2adb2..41c0932 100644
--- a/hostsidetests/angle/app/driverTest/Android.bp
+++ b/hostsidetests/angle/app/driverTest/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
compile_multilib: "both",
static_libs: [
diff --git a/hostsidetests/angle/app/driverTestSecondary/Android.bp b/hostsidetests/angle/app/driverTestSecondary/Android.bp
index fad514e..8f673c5 100644
--- a/hostsidetests/angle/app/driverTestSecondary/Android.bp
+++ b/hostsidetests/angle/app/driverTestSecondary/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
compile_multilib: "both",
static_libs: [
diff --git a/hostsidetests/appbinding/app/Android.bp b/hostsidetests/appbinding/app/Android.bp
index bbc9676..fbb4b63 100644
--- a/hostsidetests/appbinding/app/Android.bp
+++ b/hostsidetests/appbinding/app/Android.bp
@@ -47,7 +47,6 @@
manifest: "app1/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -62,7 +61,6 @@
manifest: "app2/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -77,7 +75,6 @@
manifest: "app3/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -92,7 +89,6 @@
manifest: "app4/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -106,7 +102,6 @@
manifest: "app5/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -121,7 +116,6 @@
manifest: "app6/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -137,7 +131,6 @@
test_suites: [
"cts",
"vts",
- "vts10",
"general-tests",
],
}
@@ -153,7 +146,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appbinding/hostside/Android.bp b/hostsidetests/appbinding/hostside/Android.bp
index 294f73b..cb7ebbd 100644
--- a/hostsidetests/appbinding/hostside/Android.bp
+++ b/hostsidetests/appbinding/hostside/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
target_required: [
diff --git a/hostsidetests/appcompat/compatchanges/Android.bp b/hostsidetests/appcompat/compatchanges/Android.bp
index f6da38b..e0c389e 100644
--- a/hostsidetests/appcompat/compatchanges/Android.bp
+++ b/hostsidetests/appcompat/compatchanges/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
java_resources: [":cts-global-compat-config"],
diff --git a/hostsidetests/appcompat/compatchanges/app/Android.bp b/hostsidetests/appcompat/compatchanges/app/Android.bp
index fdf069b..be40b28 100644
--- a/hostsidetests/appcompat/compatchanges/app/Android.bp
+++ b/hostsidetests/appcompat/compatchanges/app/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/Android.bp b/hostsidetests/appsecurity/Android.bp
index 3a569db..cffa133 100644
--- a/hostsidetests/appsecurity/Android.bp
+++ b/hostsidetests/appsecurity/Android.bp
@@ -38,7 +38,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
"sts",
diff --git a/hostsidetests/appsecurity/OWNERS b/hostsidetests/appsecurity/OWNERS
index 6ad0c7a..cbfad62 100644
--- a/hostsidetests/appsecurity/OWNERS
+++ b/hostsidetests/appsecurity/OWNERS
@@ -26,9 +26,9 @@
per-file ListeningPortsTest.java = cbrubaker@google.com
per-file MajorVersionTest.java = toddke@google.com
per-file OverlayHostTest.java = rtmitchell@google.com
-per-file PackageResolutionHostTest.java = toddke@google.com
-per-file PackageVisibilityTest.java = toddke@google.com
+per-file Package* = chiuwinson@google.com,patb@google.com,toddke@google.com
per-file PermissionsHostTest.java = moltmann@google.com
+per-file Pkg* = chiuwinson@google.com,patb@google.com,toddke@google.com
per-file PkgInstallSignatureVerificationTest.java = cbrubaker@google.com
per-file PrivilegedUpdateTests.java = toddke@google.com
per-file ReviewPermissionHelper = moltmann@google.com
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageSetInstallerTest.kt b/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageSetInstallerTest.kt
index 923810c..ba62f2f 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageSetInstallerTest.kt
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageSetInstallerTest.kt
@@ -30,7 +30,6 @@
import android.cts.host.utils.DeviceJUnit4ClassRunnerWithParameters
import android.cts.host.utils.DeviceJUnit4Parameterized
import com.google.common.truth.Truth.assertThat
-import com.google.common.truth.Truth.assertWithMessage
import org.junit.After
import org.junit.Before
import org.junit.Test
@@ -198,8 +197,7 @@
}
private fun assertPermission(granted: Boolean, permission: String) {
- assertThat(device.executeShellCommand("dumpsys package $TARGET_PKG | grep $permission"))
- .contains("$permission: granted=$granted")
+ assertThat(getPermissionString(permission)).contains("granted=$granted")
}
private fun grantPermission(permission: String) {
@@ -211,11 +209,7 @@
}
private fun assertGrantState(state: GrantState, permission: String) {
- val output = device.executeShellCommand(
- "dumpsys package $TARGET_PKG | grep \"$permission: granted\"").trim()
-
- // Make sure only the expected output line is returned
- assertWithMessage(output).that(output.lines().size).isEqualTo(1)
+ val output = getPermissionString(permission)
when (state) {
GrantState.TRUE -> {
@@ -238,6 +232,18 @@
}
}
+ private fun getPermissionString(permission: String) =
+ device.executeShellCommand("dumpsys package $TARGET_PKG")
+ .lineSequence()
+ .dropWhile { !it.startsWith("Packages:") } // Wait for package header
+ .drop(1) // Drop the package header itself
+ .takeWhile { it.isEmpty() || it.first().isWhitespace() } // Until next header
+ .dropWhile { !it.trim().startsWith("User $mPrimaryUserId:") } // Find user
+ .drop(1) // Drop the user header itself
+ .takeWhile { !it.trim().startsWith("User") } // Until next user
+ .filter { it.contains("$permission: granted=") }
+ .single()
+
enum class GrantState {
// Granted in full, unrestricted
TRUE,
diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
index 191c586..d70f126 100644
--- a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
@@ -23,7 +23,6 @@
min_sdk_version: "27",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
index 577bca5..30ca4ef 100644
--- a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
@@ -26,7 +26,6 @@
min_sdk_version: "27",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/Android.mk b/hostsidetests/appsecurity/test-apps/Android.mk
index 3982e2d..38b7505 100644
--- a/hostsidetests/appsecurity/test-apps/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests sts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests sts
# Build the test APKs using their own makefiles
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
index db8d617..0c4702f 100644
--- a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// although not strictly necessary, sign this app with different cert than CtsAppWithData
diff --git a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
index f4b9dea..b00dcc3 100644
--- a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -42,7 +41,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -62,7 +60,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -82,7 +79,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -102,7 +98,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp b/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
index cc1ae43..eb95cc3 100644
--- a/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
index 5f6381a..2848e19 100644
--- a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp
index 3c23f6c..3b93cbb 100644
--- a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsUsePermissionDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp b/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
index fe9bc64..ae31730 100644
--- a/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
@@ -18,7 +18,6 @@
presigned: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
@@ -29,7 +28,6 @@
presigned: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
@@ -40,7 +38,6 @@
presigned: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
diff --git a/hostsidetests/appsecurity/test-apps/CorruptApkTests/compressed_arsc/Android.bp b/hostsidetests/appsecurity/test-apps/CorruptApkTests/compressed_arsc/Android.bp
index 0994422..6fe5191 100644
--- a/hostsidetests/appsecurity/test-apps/CorruptApkTests/compressed_arsc/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/CorruptApkTests/compressed_arsc/Android.bp
@@ -18,7 +18,6 @@
presigned: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
@@ -29,7 +28,6 @@
presigned: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
@@ -41,7 +39,6 @@
preprocessed: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
@@ -53,7 +50,6 @@
preprocessed: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp b/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
index 1b34c47..a7b5ec0 100644
--- a/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
@@ -25,7 +25,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
index bb0e70c..dcba2a6 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
@@ -32,7 +32,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
index 26af01c..2e34b5e 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
@@ -28,7 +28,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
index bb550fe..6e6d949 100644
--- a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
index 2730601..3826db1 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
index 24e9998..f153697 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
@@ -31,7 +31,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
index 4713a16..a39573d 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
index f5c3cdb..bec27ae 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
index 6b97806..b7801a9 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
index 0a382a6..4a460b1 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
resource_dirs: ["res"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
index 487d4ae..416204d 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
index 0410cd5..10b8985 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp
index 48ed2ab..efe40a7 100644
--- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
index 544a10b..3140efa 100644
--- a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-keyset-test-a",
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
index 3e3cd50..33d63d1 100644
--- a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-keyset-test-b",
diff --git a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
index 06e0f32..23a9a02 100644
--- a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
index f2e4953..ebc9394 100644
--- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with different cert than CtsTargetInstrumentationApp
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
index cfaf22f..796b0b0 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
@@ -19,7 +19,6 @@
defaults: ["cts_support_defaults"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp
index d452c66..07d7fa6 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Feature splits are dependent on this split, so it must be exported.
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp
index 35bc8d7..00aaef0 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Make sure our test locale polish is not stripped.
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp
index c78c9d3..bf0adb4 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Make sure our test locale polish is not stripped.
diff --git a/hostsidetests/appsecurity/test-apps/KeyRotationTest/Android.mk b/hostsidetests/appsecurity/test-apps/KeyRotationTest/Android.mk
index 746e224..2259463 100644
--- a/hostsidetests/appsecurity/test-apps/KeyRotationTest/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/KeyRotationTest/Android.mk
@@ -32,7 +32,7 @@
LOCAL_PACKAGE_NAME := CtsSignatureQueryService
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := cts_signature_query_service
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := $(cert_dir)/ec-p256
include $(BUILD_CTS_SUPPORT_PACKAGE)
@@ -44,7 +44,7 @@
LOCAL_MANIFEST_FILE = AndroidManifest_v2.xml
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := cts_signature_query_service
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := $(cert_dir)/ec-p256_2
LOCAL_ADDITIONAL_CERTIFICATES := $(cert_dir)/ec-p256
LOCAL_CERTIFICATE_LINEAGE := $(cert_dir)/ec-p256-por_1_2-default-caps
@@ -58,7 +58,7 @@
LOCAL_MANIFEST_FILE = AndroidManifest_v3.xml
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := cts_signature_query_service
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := $(cert_dir)/ec-p256_2
LOCAL_ADDITIONAL_CERTIFICATES := $(cert_dir)/ec-p256
LOCAL_CERTIFICATE_LINEAGE := $(cert_dir)/ec-p256-por_1_2-default-caps
diff --git a/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.mk b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.mk
index 91af1b7..016687c 100644
--- a/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.mk
@@ -28,7 +28,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := cts_signature_query_service androidx.test.core androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := $(cert_dir)/ec-p256
include $(BUILD_CTS_SUPPORT_PACKAGE)
@@ -40,7 +40,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := cts_signature_query_service androidx.test.core androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := $(cert_dir)/ec-p256_2
LOCAL_ADDITIONAL_CERTIFICATES := $(cert_dir)/ec-p256
LOCAL_CERTIFICATE_LINEAGE := $(cert_dir)/ec-p256-por_1_2-default-caps
diff --git a/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp b/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp
index 97da88e..e010317 100644
--- a/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp
@@ -18,7 +18,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
index bd67ea0..83c6cb9 100644
--- a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
@@ -27,7 +27,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"sts",
"general-tests",
],
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
index 3ccf6b3..5584ba2 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
index 34788bc..97a1eda 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
index 8f2e0c3..98c4deb 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
index 7e2d7f9..cb9272c 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp
index 2dd9423..2cf6d92 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp
@@ -26,7 +26,6 @@
asset_dirs: ["assets"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -45,7 +44,6 @@
asset_dirs: ["assets"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "AndroidManifest28.xml",
@@ -65,7 +63,6 @@
asset_dirs: ["assets"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "AndroidManifest29.xml",
diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
index dfc8c01..dd59913 100644
--- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
@@ -28,7 +28,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp
index 5bd1658..92fc9c3 100644
--- a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
export_package_resources: true,
diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp b/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp
index 6813412..22dc85c 100644
--- a/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: ["CtsNoRestartBase"],
diff --git a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
index 2aaf9e6..b843d42 100644
--- a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
index c615c1c..02fe5bc 100644
--- a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp b/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp
index ae9171c..2739866 100644
--- a/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/PackageInstallerWhitelistApp/Android.bp b/hostsidetests/appsecurity/test-apps/PackageInstallerWhitelistApp/Android.bp
index 94dc075..87d2610 100644
--- a/hostsidetests/appsecurity/test-apps/PackageInstallerWhitelistApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PackageInstallerWhitelistApp/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp
index 57bb99c..9b3cbdf 100644
--- a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
index cf28a45..3414f95 100644
--- a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
index f471bf5..91cb9bc 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
@@ -14,7 +14,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
index 969aa2a..a99a78f 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
@@ -12,7 +12,7 @@
LOCAL_BUILT_MODULE_STEM := package.apk
# Make sure the build system doesn't try to resign the APK
LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
# The 'arm' apk has both arm and arm64 so's. Same for x86/x86_64.
my_apk_dir := $(subst arm64,arm,$(TARGET_ARCH))
@@ -32,7 +32,7 @@
LOCAL_BUILT_MODULE_STEM := package.apk
# Make sure the build system doesn't try to resign the APK
LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_REPLACE_PREBUILT_APK_INSTALLED := $(LOCAL_PATH)/apk/$(my_apk_dir)/CtsShimPrivUpgradeWrongSHA.apk
diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
index 1072d33..3b08af0 100644
--- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp b/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp
index 879e087..4d46c79 100644
--- a/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -36,7 +35,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
index 477202e..f547599 100644
--- a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSharedUidInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
index 6cc0dcd..0fb005f 100644
--- a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSharedUidInstall
diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
index 28d8f2d..76c8a2a 100644
--- a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
index 55894f9..279f2de 100644
--- a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstall
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
index 791f18b..08a94b5 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
@@ -31,7 +31,7 @@
LOCAL_PACKAGE_SPLITS := mdpi-v4 hdpi-v4 xhdpi-v4 xxhdpi-v4 v7 fr de
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
@@ -64,7 +64,7 @@
LOCAL_PACKAGE_SPLITS := v7
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_MANIFEST_FILE := revision/AndroidManifest.xml
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
@@ -94,7 +94,7 @@
LOCAL_PACKAGE_SPLITS := v7
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 101 --version-name OneHundredOne --replace-version
@@ -123,7 +123,7 @@
LOCAL_PACKAGE_SPLITS := v7
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
LOCAL_AAPT_FLAGS := --version-code 100 --version-name OneHundred --replace-version
@@ -150,7 +150,7 @@
LOCAL_MIN_SDK_VERSION := 4
LOCAL_PACKAGE_SPLITS := xxhdpi-v4
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk
index 00fe41a..22d0a1a 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk
@@ -31,7 +31,7 @@
LOCAL_MODULE_TAGS := tests
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_USE_AAPT2 := true
LOCAL_APK_LIBRARIES := CtsSplitApp
@@ -56,7 +56,7 @@
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 4
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk
index a01e18a..e495ad3 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk
@@ -24,6 +24,6 @@
LOCAL_LDLIBS += -llog
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_SHARED_LIBRARY)
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk
index c7c423c..8eede6c 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 100 --replace-version
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk
index 6c8716a..234a7d8 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 100 --replace-version
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk
index 4d12652..0322dcd 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 100 --replace-version
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk
index 8f4bfb2..4ee13ba 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 100 --replace-version
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk
index 5f92ea6..03c4305 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 100 --replace-version
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk
index a4c276d..14144a6 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 100 --replace-version
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk
index fe4fe48..462c1cc 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 100 --replace-version
diff --git a/hostsidetests/appsecurity/test-apps/StorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/StorageApp/Android.bp
index 64cf366..3719805 100644
--- a/hostsidetests/appsecurity/test-apps/StorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/StorageApp/Android.bp
@@ -21,7 +21,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "AndroidManifestA.xml",
@@ -39,7 +38,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "AndroidManifestB.xml",
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
index 22c367b..d7c9fd8 100644
--- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
@@ -27,7 +27,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
index 6008199..03282b3 100644
--- a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sign this app with different cert than CtsInstrumentationAppDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp b/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp
index 030cd76..ce44a1c 100644
--- a/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp
@@ -23,7 +23,6 @@
min_sdk_version: "27",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -37,7 +36,6 @@
min_sdk_version: "28",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -51,7 +49,6 @@
min_sdk_version: "28",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -69,7 +66,6 @@
min_sdk_version: "27",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -83,7 +79,6 @@
min_sdk_version: "27",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
index be20d15..c3ab6bf 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp
index 20b1082..38ccc7f 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp
index 1d53d07..94fbf5f 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp
index f9e9e9e..bf94a46 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp
index 16ce870..8a0fa9b 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp
index 7e9d641..44ad956 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp
index c8c5a92..8887a88 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
index 52d6222..5b13a8b 100644
--- a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
@@ -18,7 +18,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp
index d5f8d33..cf2cb34 100644
--- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp
index e385130..65784ce 100644
--- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp
@@ -28,7 +28,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
index 776b54b..a7d7ee8 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
index ec01e2a..9763629 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
index d2a9b2f..f52826a 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
index 87c46af..8b29b2b 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -43,7 +42,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
index 24a6401..3e17886 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -43,7 +42,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
index fd48cf2..5a58116 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
@@ -18,7 +18,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
index 9812114..769ad16 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -43,7 +42,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -61,7 +59,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -80,7 +77,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
index aeec195..1c82153 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
index e814047..ed35679 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
index f2d12b1..a075bf7 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -43,7 +42,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -62,7 +60,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
index bdfce81..786b47d 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -43,7 +42,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
index bf93e15..b2ea20e 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
index 2662dc0..1919495 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
index 1f5eb12..b35ffb5 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
@@ -22,7 +22,6 @@
certificate: ":cts-testkey1",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -35,7 +34,6 @@
certificate: ":cts-testkey1",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -48,7 +46,6 @@
certificate: ":cts-testkey1",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -61,7 +58,6 @@
certificate: ":cts-testkey2",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
index c5870c3..35d54ea 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-testkey1",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
index 82ca8f7..01d4937 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
@@ -25,7 +25,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
index 6f6798c..8674627 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-testkey1",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
index e1b7f99..dbcb1fe 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-testkey2",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
index 42a618e..28f6aae 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-testkey1",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
index c9967f8..983821c 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-testkey1",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
index 7dc1187..e02bcd3 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
@@ -25,7 +25,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -40,7 +39,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/stubime/Android.bp b/hostsidetests/appsecurity/test-apps/stubime/Android.bp
index 96057af..0038c05 100644
--- a/hostsidetests/appsecurity/test-apps/stubime/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/stubime/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/base.mk b/hostsidetests/appsecurity/test-apps/tinyapp/base.mk
index 8244aad..cc6b91e 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/base.mk
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/base.mk
@@ -16,7 +16,7 @@
# Base setup that can be included by all builds of this package.
include $(CLEAR_VARS)
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
LOCAL_SDK_VERSION := current
diff --git a/hostsidetests/atrace/Android.bp b/hostsidetests/atrace/Android.bp
index cb4ed28..380e55b 100644
--- a/hostsidetests/atrace/Android.bp
+++ b/hostsidetests/atrace/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/atrace/AtraceTestApp/Android.bp b/hostsidetests/atrace/AtraceTestApp/Android.bp
index fb0c233..88ef404 100644
--- a/hostsidetests/atrace/AtraceTestApp/Android.bp
+++ b/hostsidetests/atrace/AtraceTestApp/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp b/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp
index d077c54..9d6254c 100644
--- a/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp
+++ b/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp
index 9c05746..100718d 100644
--- a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp
+++ b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/Android.bp b/hostsidetests/backup/Android.bp
index 598c357..594ebf9 100644
--- a/hostsidetests/backup/Android.bp
+++ b/hostsidetests/backup/Android.bp
@@ -19,7 +19,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/backup/AutoRestoreApp/Android.bp b/hostsidetests/backup/AutoRestoreApp/Android.bp
index 7c842bf..0d769d5 100644
--- a/hostsidetests/backup/AutoRestoreApp/Android.bp
+++ b/hostsidetests/backup/AutoRestoreApp/Android.bp
@@ -27,7 +27,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/hostsidetests/backup/BackupTransportApp/Android.bp b/hostsidetests/backup/BackupTransportApp/Android.bp
index 2c5d133..1a80869 100644
--- a/hostsidetests/backup/BackupTransportApp/Android.bp
+++ b/hostsidetests/backup/BackupTransportApp/Android.bp
@@ -26,7 +26,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp
index 2bb3a19..e6835f3 100644
--- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp
+++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp
index 12fb76a..ba34842 100644
--- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp
+++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp
index 20a1845..f959d73 100644
--- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp
+++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/KeyValueApp/Android.bp b/hostsidetests/backup/KeyValueApp/Android.bp
index ceeaa52..7b7cea2 100644
--- a/hostsidetests/backup/KeyValueApp/Android.bp
+++ b/hostsidetests/backup/KeyValueApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp b/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp
index 75e5882..12b9a4a 100644
--- a/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp
+++ b/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Uncomment when b/78787392 is fixed
diff --git a/hostsidetests/backup/PreservedSettingsApp/Android.bp b/hostsidetests/backup/PreservedSettingsApp/Android.bp
index 4b536f3..606ab8a 100644
--- a/hostsidetests/backup/PreservedSettingsApp/Android.bp
+++ b/hostsidetests/backup/PreservedSettingsApp/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
// Uncomment when b/78787392 is fixed
// sdk_version: "system_test_current",
diff --git a/hostsidetests/backup/ProfileFullBackupApp/Android.bp b/hostsidetests/backup/ProfileFullBackupApp/Android.bp
index cfbbefc..1cb5a3d 100644
--- a/hostsidetests/backup/ProfileFullBackupApp/Android.bp
+++ b/hostsidetests/backup/ProfileFullBackupApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/ProfileKeyValueApp/Android.bp b/hostsidetests/backup/ProfileKeyValueApp/Android.bp
index ed37157..154ba22 100644
--- a/hostsidetests/backup/ProfileKeyValueApp/Android.bp
+++ b/hostsidetests/backup/ProfileKeyValueApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/backup/ProfileSerialNumberApp/Android.bp b/hostsidetests/backup/ProfileSerialNumberApp/Android.bp
index 1ac3e7d..49ef725 100644
--- a/hostsidetests/backup/ProfileSerialNumberApp/Android.bp
+++ b/hostsidetests/backup/ProfileSerialNumberApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
// Uncomment when b/78787392 is fixed
// sdk_version: "system_test_current",
diff --git a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp
index f304856..f3c36d0 100644
--- a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp
+++ b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp
index a138d03..8d88636 100644
--- a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp
+++ b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp
index 585b204..17582e0 100644
--- a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp
+++ b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/RestoreSessionTest/Android.bp b/hostsidetests/backup/RestoreSessionTest/Android.bp
index efb2fbd..fb474be 100644
--- a/hostsidetests/backup/RestoreSessionTest/Android.bp
+++ b/hostsidetests/backup/RestoreSessionTest/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp b/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp
index 6503864..daad773 100644
--- a/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp
+++ b/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
sdk_version: "current",
}
diff --git a/hostsidetests/backup/SuccessNotificationApp/Android.bp b/hostsidetests/backup/SuccessNotificationApp/Android.bp
index c27dd68..72a00bf 100644
--- a/hostsidetests/backup/SuccessNotificationApp/Android.bp
+++ b/hostsidetests/backup/SuccessNotificationApp/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
sdk_version: "current",
}
diff --git a/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp b/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp
index a9ff743..6a3139f 100644
--- a/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp
+++ b/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/backup/fullbackupapp/Android.bp b/hostsidetests/backup/fullbackupapp/Android.bp
index 1969b63..edc288c 100644
--- a/hostsidetests/backup/fullbackupapp/Android.bp
+++ b/hostsidetests/backup/fullbackupapp/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/includeexcludeapp/Android.bp b/hostsidetests/backup/includeexcludeapp/Android.bp
index 6b6a6a4..0b37374 100644
--- a/hostsidetests/backup/includeexcludeapp/Android.bp
+++ b/hostsidetests/backup/includeexcludeapp/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/restoresessionapp1/Android.bp b/hostsidetests/backup/restoresessionapp1/Android.bp
index 82d12c8..51e2482 100644
--- a/hostsidetests/backup/restoresessionapp1/Android.bp
+++ b/hostsidetests/backup/restoresessionapp1/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
sdk_version: "system_current",
}
diff --git a/hostsidetests/backup/restoresessionapp2/Android.bp b/hostsidetests/backup/restoresessionapp2/Android.bp
index 6a6d594..91b4d2f 100644
--- a/hostsidetests/backup/restoresessionapp2/Android.bp
+++ b/hostsidetests/backup/restoresessionapp2/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
sdk_version: "system_current",
}
diff --git a/hostsidetests/backup/restoresessionapp3/Android.bp b/hostsidetests/backup/restoresessionapp3/Android.bp
index eb6a720..78da7bb 100644
--- a/hostsidetests/backup/restoresessionapp3/Android.bp
+++ b/hostsidetests/backup/restoresessionapp3/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
sdk_version: "system_current",
}
diff --git a/hostsidetests/blobstore/Android.bp b/hostsidetests/blobstore/Android.bp
index 34502b7..d699def 100644
--- a/hostsidetests/blobstore/Android.bp
+++ b/hostsidetests/blobstore/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests"
]
}
@@ -46,7 +45,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests"
]
}
diff --git a/hostsidetests/bootstats/Android.bp b/hostsidetests/bootstats/Android.bp
index 3681c59..b894fcf 100644
--- a/hostsidetests/bootstats/Android.bp
+++ b/hostsidetests/bootstats/Android.bp
@@ -28,7 +28,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/classloaders/splits/Android.bp b/hostsidetests/classloaders/splits/Android.bp
index 507987f..f19b5da 100644
--- a/hostsidetests/classloaders/splits/Android.bp
+++ b/hostsidetests/classloaders/splits/Android.bp
@@ -23,7 +23,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
required: [
diff --git a/hostsidetests/classloaders/useslibrary/Android.bp b/hostsidetests/classloaders/useslibrary/Android.bp
index 9215513..10c1986 100644
--- a/hostsidetests/classloaders/useslibrary/Android.bp
+++ b/hostsidetests/classloaders/useslibrary/Android.bp
@@ -23,7 +23,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
required: [ "CtsUsesLibraryApp" ],
diff --git a/hostsidetests/compilation/Android.bp b/hostsidetests/compilation/Android.bp
index e6a982c..636dfc8 100644
--- a/hostsidetests/compilation/Android.bp
+++ b/hostsidetests/compilation/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/compilation/app/Android.bp b/hostsidetests/compilation/app/Android.bp
index 0eeabfb..d41b5bc 100644
--- a/hostsidetests/compilation/app/Android.bp
+++ b/hostsidetests/compilation/app/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/content/Android.bp b/hostsidetests/content/Android.bp
index 0f0e03e..3cd3688 100644
--- a/hostsidetests/content/Android.bp
+++ b/hostsidetests/content/Android.bp
@@ -27,7 +27,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
index 77c5456..dac2663 100644
--- a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
+++ b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp
index d74d620..d63f6cd 100644
--- a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp
+++ b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp
index 71304f7..82c3696 100644
--- a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp
@@ -26,7 +26,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/cpptools/Android.bp b/hostsidetests/cpptools/Android.bp
index 6f895c8..23887e2 100644
--- a/hostsidetests/cpptools/Android.bp
+++ b/hostsidetests/cpptools/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/cpptools/test-apps/BasicApp/Android.bp b/hostsidetests/cpptools/test-apps/BasicApp/Android.bp
index 66b25bb..8562d3a 100644
--- a/hostsidetests/cpptools/test-apps/BasicApp/Android.bp
+++ b/hostsidetests/cpptools/test-apps/BasicApp/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp b/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp
index 96b0554..8938068 100644
--- a/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp
+++ b/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp
@@ -31,7 +31,6 @@
},
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp b/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp
index 545f1a4..d4399f9 100644
--- a/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp
+++ b/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/deviceidle/Android.bp b/hostsidetests/deviceidle/Android.bp
index faaaaaf..d22db35 100644
--- a/hostsidetests/deviceidle/Android.bp
+++ b/hostsidetests/deviceidle/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/Android.bp b/hostsidetests/devicepolicy/Android.bp
index 0e89a22..537151f 100644
--- a/hostsidetests/devicepolicy/Android.bp
+++ b/hostsidetests/devicepolicy/Android.bp
@@ -30,7 +30,6 @@
"arcts",
"cts",
"general-tests",
- "vts10",
],
java_resource_dirs: ["res"],
data: [":current-api-xml"],
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Android.bp b/hostsidetests/devicepolicy/app/AccountCheck/Android.bp
index 45d374f..ef03e37 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src-owner/**/*.java"],
@@ -39,7 +38,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src-owner/**/*.java"],
@@ -60,7 +58,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src-owner/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp
index 153b594..e499709 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp
index d40d04c..2e8697d 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AccountManagement/Android.bp b/hostsidetests/devicepolicy/app/AccountManagement/Android.bp
index 5bd2ff6..25fb39c 100644
--- a/hostsidetests/devicepolicy/app/AccountManagement/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountManagement/Android.bp
@@ -19,7 +19,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp b/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp
index 9b35a75..98146ff 100644
--- a/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/Assistant/Android.bp b/hostsidetests/devicepolicy/app/Assistant/Android.bp
index 5e1bb88..0de1b25 100644
--- a/hostsidetests/devicepolicy/app/Assistant/Android.bp
+++ b/hostsidetests/devicepolicy/app/Assistant/Android.bp
@@ -19,10 +19,8 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/devicepolicy/app/AutofillApp/Android.bp b/hostsidetests/devicepolicy/app/AutofillApp/Android.bp
index c79c0a5..27b4bb2 100644
--- a/hostsidetests/devicepolicy/app/AutofillApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/AutofillApp/Android.bp
@@ -20,7 +20,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/CertInstaller/Android.bp b/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
index 8274e74..c124684 100644
--- a/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
+++ b/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
@@ -33,7 +33,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp
index ca9d9dd..dc652cb 100644
--- a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp b/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp
index 3ed0a7f..e347131 100644
--- a/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp
@@ -20,7 +20,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp b/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp
index c50418d..9636e4b 100644
--- a/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp
@@ -20,7 +20,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp b/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp
index 590a7d1..ebdf983 100644
--- a/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp
@@ -20,7 +20,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp
index b4b4134..6e8803d 100644
--- a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp
@@ -41,7 +41,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -70,7 +69,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
index 2d74684..c3d1d5d 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
index 24aafd4..6f2d457 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
index 8643aa6..4d56254 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
index 89476ed..8510ab8 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
index c27b134..380ddc1 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
index ec9ae62..2a11871 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp
index a33eec5..7a3fb81 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp b/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp
index aefa217..96e959c 100644
--- a/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp
@@ -18,7 +18,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/Android.bp b/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
index 6e59646..b10477e 100644
--- a/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
@@ -33,7 +33,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp b/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp
index 085aaab..668880c 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "api23/AndroidManifest.xml",
@@ -56,7 +55,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
manifest: "api24/AndroidManifest.xml",
@@ -80,7 +78,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
manifest: "api29/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp b/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp
index d534925..6f4503b 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "package1/AndroidManifest.xml",
@@ -46,7 +45,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "package2/AndroidManifest.xml",
@@ -66,7 +64,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "package3/AndroidManifest.xml",
@@ -86,7 +83,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "package4/AndroidManifest.xml",
@@ -106,7 +102,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "packageb/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
index 307e985..3abd12d 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
@@ -34,7 +34,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "api23/AndroidManifest.xml",
@@ -63,7 +62,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
manifest: "api25/AndroidManifest.xml",
@@ -92,7 +90,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
manifest: "latest/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp b/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
index 0e212b8..378e9af 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
@@ -43,7 +43,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/DummyApps/Android.bp b/hostsidetests/devicepolicy/app/DummyApps/Android.bp
index be34373..b6679f0 100644
--- a/hostsidetests/devicepolicy/app/DummyApps/Android.bp
+++ b/hostsidetests/devicepolicy/app/DummyApps/Android.bp
@@ -32,7 +32,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "dummyapp1/AndroidManifest.xml",
@@ -58,7 +57,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "dummyapp2/AndroidManifest.xml",
@@ -84,7 +82,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "dummyapp3/AndroidManifest.xml",
@@ -110,7 +107,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "dummyapp4/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DummyIme/Android.bp b/hostsidetests/devicepolicy/app/DummyIme/Android.bp
index 7f817cd..c4a83fa 100644
--- a/hostsidetests/devicepolicy/app/DummyIme/Android.bp
+++ b/hostsidetests/devicepolicy/app/DummyIme/Android.bp
@@ -23,7 +23,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp b/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp
index 36e0971..9dfcdd7 100644
--- a/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp
+++ b/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp
index 6ffd45a..f00d03a 100644
--- a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp
@@ -27,7 +27,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
@@ -47,7 +46,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
manifest: "no_launcher_activity_AndroidManifest.xml",
@@ -68,7 +66,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
manifest: "no_permission_AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp b/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp
index 7909e84..c3654ec 100644
--- a/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp
+++ b/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp
@@ -30,7 +30,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/IntentSender/Android.bp b/hostsidetests/devicepolicy/app/IntentSender/Android.bp
index 24d291f..2a83c8e 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/Android.bp
+++ b/hostsidetests/devicepolicy/app/IntentSender/Android.bp
@@ -30,7 +30,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/LauncherTests/Android.bp b/hostsidetests/devicepolicy/app/LauncherTests/Android.bp
index 697c6b5..239eb84 100644
--- a/hostsidetests/devicepolicy/app/LauncherTests/Android.bp
+++ b/hostsidetests/devicepolicy/app/LauncherTests/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp
index 13bc061..642748e 100644
--- a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp
+++ b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp
@@ -23,7 +23,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
index a99bd1b..565c88c 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
@@ -36,7 +36,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp b/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp
index c3ae579..87dd24b 100644
--- a/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp
@@ -20,7 +20,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/NotificationSender/Android.bp b/hostsidetests/devicepolicy/app/NotificationSender/Android.bp
index e8fe0e4..774f4ca 100644
--- a/hostsidetests/devicepolicy/app/NotificationSender/Android.bp
+++ b/hostsidetests/devicepolicy/app/NotificationSender/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp b/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp
index fd90caa..8ffabca 100644
--- a/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp
+++ b/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp b/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp
index 0b71f53..f2a77fb 100644
--- a/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp
+++ b/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp
@@ -29,7 +29,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/PrintingApp/Android.bp b/hostsidetests/devicepolicy/app/PrintingApp/Android.bp
index 7d30624..c304b08 100644
--- a/hostsidetests/devicepolicy/app/PrintingApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/PrintingApp/Android.bp
@@ -21,7 +21,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp b/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp
index 55eaa6c..80ac6cb 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp
@@ -31,7 +31,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/SharingApps/Android.bp b/hostsidetests/devicepolicy/app/SharingApps/Android.bp
index 83df66c..161a32c 100644
--- a/hostsidetests/devicepolicy/app/SharingApps/Android.bp
+++ b/hostsidetests/devicepolicy/app/SharingApps/Android.bp
@@ -32,7 +32,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "sharingapp1/AndroidManifest.xml",
@@ -58,7 +57,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "sharingapp2/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/Android.bp b/hostsidetests/devicepolicy/app/SimpleApp/Android.bp
index 1a6ebf8..3b80c07 100644
--- a/hostsidetests/devicepolicy/app/SimpleApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/SimpleApp/Android.bp
@@ -20,7 +20,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp b/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp
index b9b6f8d..132b724 100644
--- a/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp
@@ -23,7 +23,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/SimpleSmsApp/Android.bp b/hostsidetests/devicepolicy/app/SimpleSmsApp/Android.bp
index f6ad171..25c5b27 100644
--- a/hostsidetests/devicepolicy/app/SimpleSmsApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/SimpleSmsApp/Android.bp
@@ -23,7 +23,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp b/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp
index bd3e2e2..446ae6f 100644
--- a/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp
@@ -31,7 +31,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp
index 3ff3111..6a8fb52 100644
--- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp
@@ -33,7 +33,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp
index a6f1ac6..0012763 100644
--- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp
@@ -33,7 +33,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp b/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp
index 5066bc2..ddafb6d 100644
--- a/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp
+++ b/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp
index 4ce52a1..f894929 100644
--- a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp
+++ b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/Android.bp b/hostsidetests/dumpsys/Android.bp
index 1921845..3a3a2c5 100644
--- a/hostsidetests/dumpsys/Android.bp
+++ b/hostsidetests/dumpsys/Android.bp
@@ -25,7 +25,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp
index c35770d..f926857 100644
--- a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp
+++ b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp
index c5f8ee9..3faa49a 100644
--- a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp
@@ -27,7 +27,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp
index 713e207..a721e6e 100644
--- a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp
+++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/storagedapp/Android.bp b/hostsidetests/dumpsys/apps/storagedapp/Android.bp
index b4f5fc9..7e60522 100644
--- a/hostsidetests/dumpsys/apps/storagedapp/Android.bp
+++ b/hostsidetests/dumpsys/apps/storagedapp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/edi/Android.bp b/hostsidetests/edi/Android.bp
index c2f4f6e..20f626c 100644
--- a/hostsidetests/edi/Android.bp
+++ b/hostsidetests/edi/Android.bp
@@ -18,7 +18,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/harmfulappwarning/Android.bp b/hostsidetests/harmfulappwarning/Android.bp
index 6a095fc..cb7d3ef 100644
--- a/hostsidetests/harmfulappwarning/Android.bp
+++ b/hostsidetests/harmfulappwarning/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/harmfulappwarning/sampleapp/Android.bp b/hostsidetests/harmfulappwarning/sampleapp/Android.bp
index 35de3bd..7eda22d 100644
--- a/hostsidetests/harmfulappwarning/sampleapp/Android.bp
+++ b/hostsidetests/harmfulappwarning/sampleapp/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/harmfulappwarning/testapp/Android.bp b/hostsidetests/harmfulappwarning/testapp/Android.bp
index 8d6a584..a6d0e88 100644
--- a/hostsidetests/harmfulappwarning/testapp/Android.bp
+++ b/hostsidetests/harmfulappwarning/testapp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/hdmicec/Android.bp b/hostsidetests/hdmicec/Android.bp
index 4268ff1..5fa3f52 100644
--- a/hostsidetests/hdmicec/Android.bp
+++ b/hostsidetests/hdmicec/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/incident/Android.bp b/hostsidetests/incident/Android.bp
index 2bbb5a5..932948e 100644
--- a/hostsidetests/incident/Android.bp
+++ b/hostsidetests/incident/Android.bp
@@ -18,7 +18,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/incident/apps/batterystatsapp/Android.bp b/hostsidetests/incident/apps/batterystatsapp/Android.bp
index 0307a57..5110288 100644
--- a/hostsidetests/incident/apps/batterystatsapp/Android.bp
+++ b/hostsidetests/incident/apps/batterystatsapp/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/boundwidgetapp/Android.bp b/hostsidetests/incident/apps/boundwidgetapp/Android.bp
index 6bd97ba..7ee158f 100644
--- a/hostsidetests/incident/apps/boundwidgetapp/Android.bp
+++ b/hostsidetests/incident/apps/boundwidgetapp/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/errorsapp/Android.bp b/hostsidetests/incident/apps/errorsapp/Android.bp
index 70a7952..b21bd93 100644
--- a/hostsidetests/incident/apps/errorsapp/Android.bp
+++ b/hostsidetests/incident/apps/errorsapp/Android.bp
@@ -32,7 +32,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/graphicsstatsapp/Android.bp b/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
index 2791a78..5ca33a8 100644
--- a/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
+++ b/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/notificationsapp/Android.bp b/hostsidetests/incident/apps/notificationsapp/Android.bp
index a7f7848..06f15e4 100644
--- a/hostsidetests/incident/apps/notificationsapp/Android.bp
+++ b/hostsidetests/incident/apps/notificationsapp/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/procstatsapp/Android.bp b/hostsidetests/incident/apps/procstatsapp/Android.bp
index 5aada42..51b567b 100644
--- a/hostsidetests/incident/apps/procstatsapp/Android.bp
+++ b/hostsidetests/incident/apps/procstatsapp/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/inputmethodservice/common/Android.bp b/hostsidetests/inputmethodservice/common/Android.bp
index 32d20a2..6d07408 100644
--- a/hostsidetests/inputmethodservice/common/Android.bp
+++ b/hostsidetests/inputmethodservice/common/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
index 4073b9e..4d4fb3e 100644
--- a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
@@ -28,7 +28,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp b/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp
index 966de7d..bab73b4 100644
--- a/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp b/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp
index 9d58ed5..65e546c 100644
--- a/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp b/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp
index 2e7bc82..875c3bc 100644
--- a/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/Android.bp b/hostsidetests/inputmethodservice/deviceside/lib/Android.bp
index fbcc0ef3..01ca2c0 100644
--- a/hostsidetests/inputmethodservice/deviceside/lib/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/lib/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/Android.bp b/hostsidetests/inputmethodservice/deviceside/provider/Android.bp
index 7a74cd5..efbf893 100644
--- a/hostsidetests/inputmethodservice/deviceside/provider/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/provider/Android.bp
@@ -23,7 +23,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/hostside/Android.bp b/hostsidetests/inputmethodservice/hostside/Android.bp
index 2578f45..c954414 100644
--- a/hostsidetests/inputmethodservice/hostside/Android.bp
+++ b/hostsidetests/inputmethodservice/hostside/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/jdwpsecurity/Android.bp b/hostsidetests/jdwpsecurity/Android.bp
index 00c8e81..9eedf9a 100644
--- a/hostsidetests/jdwpsecurity/Android.bp
+++ b/hostsidetests/jdwpsecurity/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJdwpApp"],
diff --git a/hostsidetests/jdwptunnel/Android.bp b/hostsidetests/jdwptunnel/Android.bp
index a8f562c..62b0ed0 100644
--- a/hostsidetests/jdwptunnel/Android.bp
+++ b/hostsidetests/jdwptunnel/Android.bp
@@ -34,7 +34,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/hostsidetests/jvmti/allocation-tracking/Android.bp b/hostsidetests/jvmti/allocation-tracking/Android.bp
index 963c517..dce3d16 100644
--- a/hostsidetests/jvmti/allocation-tracking/Android.bp
+++ b/hostsidetests/jvmti/allocation-tracking/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/jvmti/allocation-tracking/app/Android.bp b/hostsidetests/jvmti/allocation-tracking/app/Android.bp
index da10494..6e42781 100644
--- a/hostsidetests/jvmti/allocation-tracking/app/Android.bp
+++ b/hostsidetests/jvmti/allocation-tracking/app/Android.bp
@@ -23,7 +23,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: ["CtsJvmtiDeviceAppBase"],
diff --git a/hostsidetests/jvmti/attaching/Android.bp b/hostsidetests/jvmti/attaching/Android.bp
index a621742..3d50f4a 100644
--- a/hostsidetests/jvmti/attaching/Android.bp
+++ b/hostsidetests/jvmti/attaching/Android.bp
@@ -81,7 +81,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
test_config: "host/AndroidTest.xml",
diff --git a/hostsidetests/jvmti/redefining/Android.bp b/hostsidetests/jvmti/redefining/Android.bp
index 1dcd552..7bb3d1f 100644
--- a/hostsidetests/jvmti/redefining/Android.bp
+++ b/hostsidetests/jvmti/redefining/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRedefineClassesDeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1900/Android.bp b/hostsidetests/jvmti/run-tests/test-1900/Android.bp
index 041106a..62ed6fa 100644
--- a/hostsidetests/jvmti/run-tests/test-1900/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1900/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1900DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1901/Android.bp b/hostsidetests/jvmti/run-tests/test-1901/Android.bp
index 5774e8c..e4dca54 100644
--- a/hostsidetests/jvmti/run-tests/test-1901/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1901/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1901DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1902/Android.bp b/hostsidetests/jvmti/run-tests/test-1902/Android.bp
index c61a7dc..e9a84ad 100644
--- a/hostsidetests/jvmti/run-tests/test-1902/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1902/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1902DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1903/Android.bp b/hostsidetests/jvmti/run-tests/test-1903/Android.bp
index 68dec58..652d251 100644
--- a/hostsidetests/jvmti/run-tests/test-1903/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1903/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1903DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1904/Android.bp b/hostsidetests/jvmti/run-tests/test-1904/Android.bp
index 4bef6ba..9a61f13 100644
--- a/hostsidetests/jvmti/run-tests/test-1904/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1904/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1904DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1906/Android.bp b/hostsidetests/jvmti/run-tests/test-1906/Android.bp
index 206a3a2..8dc8213 100644
--- a/hostsidetests/jvmti/run-tests/test-1906/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1906/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1906DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1907/Android.bp b/hostsidetests/jvmti/run-tests/test-1907/Android.bp
index 1c14eba..13fe8e4 100644
--- a/hostsidetests/jvmti/run-tests/test-1907/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1907/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1907DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1908/Android.bp b/hostsidetests/jvmti/run-tests/test-1908/Android.bp
index 0adcba5..21aa2a3 100644
--- a/hostsidetests/jvmti/run-tests/test-1908/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1908/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1908DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1909/Android.bp b/hostsidetests/jvmti/run-tests/test-1909/Android.bp
index ad69a39..df71e8f 100644
--- a/hostsidetests/jvmti/run-tests/test-1909/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1909/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1909DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1910/Android.bp b/hostsidetests/jvmti/run-tests/test-1910/Android.bp
index 73a5f01..791ce9f 100644
--- a/hostsidetests/jvmti/run-tests/test-1910/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1910/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1910DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1911/Android.bp b/hostsidetests/jvmti/run-tests/test-1911/Android.bp
index dcc5b1a..b3dc656 100644
--- a/hostsidetests/jvmti/run-tests/test-1911/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1911/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1911DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1912/Android.bp b/hostsidetests/jvmti/run-tests/test-1912/Android.bp
index 1166b5b..8fdc19b 100644
--- a/hostsidetests/jvmti/run-tests/test-1912/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1912/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1912DeviceApp"]
diff --git a/hostsidetests/jvmti/run-tests/test-1913/Android.bp b/hostsidetests/jvmti/run-tests/test-1913/Android.bp
index ba74605..5ef38fa 100644
--- a/hostsidetests/jvmti/run-tests/test-1913/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1913/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1913DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1914/Android.bp b/hostsidetests/jvmti/run-tests/test-1914/Android.bp
index eac355d..7be3ddd 100644
--- a/hostsidetests/jvmti/run-tests/test-1914/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1914/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1914DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1915/Android.bp b/hostsidetests/jvmti/run-tests/test-1915/Android.bp
index 703fd54..0ba22cc 100644
--- a/hostsidetests/jvmti/run-tests/test-1915/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1915/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1915DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1916/Android.bp b/hostsidetests/jvmti/run-tests/test-1916/Android.bp
index cd05d0b..4e7e4e5 100644
--- a/hostsidetests/jvmti/run-tests/test-1916/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1916/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1916DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1917/Android.bp b/hostsidetests/jvmti/run-tests/test-1917/Android.bp
index 757db9b..64898af 100644
--- a/hostsidetests/jvmti/run-tests/test-1917/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1917/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1917DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1920/Android.bp b/hostsidetests/jvmti/run-tests/test-1920/Android.bp
index b466c1a..c8926b9 100644
--- a/hostsidetests/jvmti/run-tests/test-1920/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1920/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1920DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1921/Android.bp b/hostsidetests/jvmti/run-tests/test-1921/Android.bp
index e803ffc..a6c357f 100644
--- a/hostsidetests/jvmti/run-tests/test-1921/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1921/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1921DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1922/Android.bp b/hostsidetests/jvmti/run-tests/test-1922/Android.bp
index 707686a..73e8e51 100644
--- a/hostsidetests/jvmti/run-tests/test-1922/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1922/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1922DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1923/Android.bp b/hostsidetests/jvmti/run-tests/test-1923/Android.bp
index 171cd88..d2d6dcb 100644
--- a/hostsidetests/jvmti/run-tests/test-1923/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1923/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1923DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1924/Android.bp b/hostsidetests/jvmti/run-tests/test-1924/Android.bp
index 9ea1ee2..4c4fcd7 100644
--- a/hostsidetests/jvmti/run-tests/test-1924/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1924/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1924DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1925/Android.bp b/hostsidetests/jvmti/run-tests/test-1925/Android.bp
index 23b9e37..a981c3c 100644
--- a/hostsidetests/jvmti/run-tests/test-1925/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1925/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1925DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1926/Android.bp b/hostsidetests/jvmti/run-tests/test-1926/Android.bp
index 51e1132..110866e 100644
--- a/hostsidetests/jvmti/run-tests/test-1926/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1926/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1926DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1927/Android.bp b/hostsidetests/jvmti/run-tests/test-1927/Android.bp
index 0f87eb7..eb7078c 100644
--- a/hostsidetests/jvmti/run-tests/test-1927/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1927/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1927DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1928/Android.bp b/hostsidetests/jvmti/run-tests/test-1928/Android.bp
index 1d7e4ea..1a678da 100644
--- a/hostsidetests/jvmti/run-tests/test-1928/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1928/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1928DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1930/Android.bp b/hostsidetests/jvmti/run-tests/test-1930/Android.bp
index e4b90e4..23c9b59 100644
--- a/hostsidetests/jvmti/run-tests/test-1930/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1930/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1930DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1931/Android.bp b/hostsidetests/jvmti/run-tests/test-1931/Android.bp
index d011fbe..feb6e6a 100644
--- a/hostsidetests/jvmti/run-tests/test-1931/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1931/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1931DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1932/Android.bp b/hostsidetests/jvmti/run-tests/test-1932/Android.bp
index 2818716..5aee52d 100644
--- a/hostsidetests/jvmti/run-tests/test-1932/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1932/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1932DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1933/Android.bp b/hostsidetests/jvmti/run-tests/test-1933/Android.bp
index 5372f06..cb0fed0b 100644
--- a/hostsidetests/jvmti/run-tests/test-1933/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1933/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1933DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1934/Android.bp b/hostsidetests/jvmti/run-tests/test-1934/Android.bp
index 0dd68d8..301ffba 100644
--- a/hostsidetests/jvmti/run-tests/test-1934/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1934/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1934DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1936/Android.bp b/hostsidetests/jvmti/run-tests/test-1936/Android.bp
index 8b2bee4..6e3e1d7 100644
--- a/hostsidetests/jvmti/run-tests/test-1936/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1936/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1936DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1937/Android.bp b/hostsidetests/jvmti/run-tests/test-1937/Android.bp
index 0876bbf..e85825b 100644
--- a/hostsidetests/jvmti/run-tests/test-1937/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1937/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1937DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1939/Android.bp b/hostsidetests/jvmti/run-tests/test-1939/Android.bp
index d139c50..6c5f257 100644
--- a/hostsidetests/jvmti/run-tests/test-1939/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1939/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1939DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1941/Android.bp b/hostsidetests/jvmti/run-tests/test-1941/Android.bp
index b8a153b..80246a0 100644
--- a/hostsidetests/jvmti/run-tests/test-1941/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1941/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1941DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1942/Android.bp b/hostsidetests/jvmti/run-tests/test-1942/Android.bp
index 4e968fa..2649361 100644
--- a/hostsidetests/jvmti/run-tests/test-1942/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1942/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1942DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1943/Android.bp b/hostsidetests/jvmti/run-tests/test-1943/Android.bp
index 053b61d..2b8ff6c 100644
--- a/hostsidetests/jvmti/run-tests/test-1943/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1943/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1943DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1953/Android.bp b/hostsidetests/jvmti/run-tests/test-1953/Android.bp
index e2d17cc..5cb0fc2 100644
--- a/hostsidetests/jvmti/run-tests/test-1953/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1953/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1953DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1958/Android.bp b/hostsidetests/jvmti/run-tests/test-1958/Android.bp
index 16c31ae..ce50088 100644
--- a/hostsidetests/jvmti/run-tests/test-1958/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1958/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1958DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1962/Android.bp b/hostsidetests/jvmti/run-tests/test-1962/Android.bp
index e06a813..b1a4087 100644
--- a/hostsidetests/jvmti/run-tests/test-1962/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1962/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1962DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1967/Android.bp b/hostsidetests/jvmti/run-tests/test-1967/Android.bp
index ff060d2..370596b 100644
--- a/hostsidetests/jvmti/run-tests/test-1967/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1967/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1967DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1968/Android.bp b/hostsidetests/jvmti/run-tests/test-1968/Android.bp
index 0f2a3b3..1c9f406 100644
--- a/hostsidetests/jvmti/run-tests/test-1968/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1968/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1968DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1969/Android.bp b/hostsidetests/jvmti/run-tests/test-1969/Android.bp
index 273f130..46975d5 100644
--- a/hostsidetests/jvmti/run-tests/test-1969/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1969/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1969DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1970/Android.bp b/hostsidetests/jvmti/run-tests/test-1970/Android.bp
index ec5d612..be85e20 100644
--- a/hostsidetests/jvmti/run-tests/test-1970/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1970/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1970DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1971/Android.bp b/hostsidetests/jvmti/run-tests/test-1971/Android.bp
index d0b7956..db2d5ef 100644
--- a/hostsidetests/jvmti/run-tests/test-1971/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1971/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1971DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1974/Android.bp b/hostsidetests/jvmti/run-tests/test-1974/Android.bp
index 16f2456..87a90ed 100644
--- a/hostsidetests/jvmti/run-tests/test-1974/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1974/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1974DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1975/Android.bp b/hostsidetests/jvmti/run-tests/test-1975/Android.bp
index 4898c9c..e23cfa7 100644
--- a/hostsidetests/jvmti/run-tests/test-1975/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1975/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1975DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1976/Android.bp b/hostsidetests/jvmti/run-tests/test-1976/Android.bp
index 2deca03..38e8612 100644
--- a/hostsidetests/jvmti/run-tests/test-1976/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1976/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1976DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1977/Android.bp b/hostsidetests/jvmti/run-tests/test-1977/Android.bp
index 5261650..3b76f5b 100644
--- a/hostsidetests/jvmti/run-tests/test-1977/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1977/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1977DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1978/Android.bp b/hostsidetests/jvmti/run-tests/test-1978/Android.bp
index 45c4e58..bb3bfce 100644
--- a/hostsidetests/jvmti/run-tests/test-1978/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1978/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1978DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1979/Android.bp b/hostsidetests/jvmti/run-tests/test-1979/Android.bp
index 6f367de..bd812f7 100644
--- a/hostsidetests/jvmti/run-tests/test-1979/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1979/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1979DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1981/Android.bp b/hostsidetests/jvmti/run-tests/test-1981/Android.bp
index add3e8d..4e1982d 100644
--- a/hostsidetests/jvmti/run-tests/test-1981/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1981/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1981DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1982/Android.bp b/hostsidetests/jvmti/run-tests/test-1982/Android.bp
index 2dfb330..f946542 100644
--- a/hostsidetests/jvmti/run-tests/test-1982/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1982/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1982DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1983/Android.bp b/hostsidetests/jvmti/run-tests/test-1983/Android.bp
index a8d5295..0a829ee 100644
--- a/hostsidetests/jvmti/run-tests/test-1983/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1983/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1983DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1984/Android.bp b/hostsidetests/jvmti/run-tests/test-1984/Android.bp
index b15cb13..4a5b859 100644
--- a/hostsidetests/jvmti/run-tests/test-1984/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1984/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1984DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1988/Android.bp b/hostsidetests/jvmti/run-tests/test-1988/Android.bp
index 15e7f53..fe73550 100644
--- a/hostsidetests/jvmti/run-tests/test-1988/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1988/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1988DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1989/Android.bp b/hostsidetests/jvmti/run-tests/test-1989/Android.bp
index b0eb4f4..6cf902b 100644
--- a/hostsidetests/jvmti/run-tests/test-1989/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1989/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1989DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1990/Android.bp b/hostsidetests/jvmti/run-tests/test-1990/Android.bp
index 41b2c6b..d8236d1 100644
--- a/hostsidetests/jvmti/run-tests/test-1990/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1990/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1990DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1991/Android.bp b/hostsidetests/jvmti/run-tests/test-1991/Android.bp
index 201947f..b7457f4 100644
--- a/hostsidetests/jvmti/run-tests/test-1991/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1991/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1991DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1992/Android.bp b/hostsidetests/jvmti/run-tests/test-1992/Android.bp
index 9b50a61..6dd5bac 100644
--- a/hostsidetests/jvmti/run-tests/test-1992/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1992/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1992DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1994/Android.bp b/hostsidetests/jvmti/run-tests/test-1994/Android.bp
index 3948b2d..7445270 100644
--- a/hostsidetests/jvmti/run-tests/test-1994/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1994/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1994DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1995/Android.bp b/hostsidetests/jvmti/run-tests/test-1995/Android.bp
index b92413b..c5c9b2f 100644
--- a/hostsidetests/jvmti/run-tests/test-1995/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1995/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1995DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1996/Android.bp b/hostsidetests/jvmti/run-tests/test-1996/Android.bp
index fc2404e..f74d839 100644
--- a/hostsidetests/jvmti/run-tests/test-1996/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1996/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1996DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1997/Android.bp b/hostsidetests/jvmti/run-tests/test-1997/Android.bp
index f2414a5..c604480 100644
--- a/hostsidetests/jvmti/run-tests/test-1997/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1997/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1997DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1998/Android.bp b/hostsidetests/jvmti/run-tests/test-1998/Android.bp
index 3bbe2c9..04d2ee1 100644
--- a/hostsidetests/jvmti/run-tests/test-1998/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1998/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1998DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1999/Android.bp b/hostsidetests/jvmti/run-tests/test-1999/Android.bp
index 00c0ff7..bb38d8e 100644
--- a/hostsidetests/jvmti/run-tests/test-1999/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1999/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1999DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2001/Android.bp b/hostsidetests/jvmti/run-tests/test-2001/Android.bp
index 8d83aba..788d19b 100644
--- a/hostsidetests/jvmti/run-tests/test-2001/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2001/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2001DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2002/Android.bp b/hostsidetests/jvmti/run-tests/test-2002/Android.bp
index fcf4263..6e17916 100644
--- a/hostsidetests/jvmti/run-tests/test-2002/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2002/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2002DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2003/Android.bp b/hostsidetests/jvmti/run-tests/test-2003/Android.bp
index a4e9f1c..5c0a0e7 100644
--- a/hostsidetests/jvmti/run-tests/test-2003/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2003/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2003DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2004/Android.bp b/hostsidetests/jvmti/run-tests/test-2004/Android.bp
index 11b5fdc..eda8530 100644
--- a/hostsidetests/jvmti/run-tests/test-2004/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2004/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2004DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2005/Android.bp b/hostsidetests/jvmti/run-tests/test-2005/Android.bp
index 34a7338..866c971 100644
--- a/hostsidetests/jvmti/run-tests/test-2005/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2005/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2005DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2006/Android.bp b/hostsidetests/jvmti/run-tests/test-2006/Android.bp
index d3007e2..51500ae 100644
--- a/hostsidetests/jvmti/run-tests/test-2006/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2006/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2006DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2007/Android.bp b/hostsidetests/jvmti/run-tests/test-2007/Android.bp
index d1f05d3..9a9a89a 100644
--- a/hostsidetests/jvmti/run-tests/test-2007/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2007/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2007DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-902/Android.bp b/hostsidetests/jvmti/run-tests/test-902/Android.bp
index 39e7b54..ae7a8ed 100644
--- a/hostsidetests/jvmti/run-tests/test-902/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-902/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest902DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-903/Android.bp b/hostsidetests/jvmti/run-tests/test-903/Android.bp
index d5bef56..2fdc29d 100644
--- a/hostsidetests/jvmti/run-tests/test-903/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-903/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest903DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-904/Android.bp b/hostsidetests/jvmti/run-tests/test-904/Android.bp
index 98b3e15..df5c01f 100644
--- a/hostsidetests/jvmti/run-tests/test-904/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-904/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest904DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-905/Android.bp b/hostsidetests/jvmti/run-tests/test-905/Android.bp
index e1e0ec4..5889c77 100644
--- a/hostsidetests/jvmti/run-tests/test-905/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-905/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest905DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-906/Android.bp b/hostsidetests/jvmti/run-tests/test-906/Android.bp
index 35a024f..e72f5c2 100644
--- a/hostsidetests/jvmti/run-tests/test-906/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-906/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest906DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-907/Android.bp b/hostsidetests/jvmti/run-tests/test-907/Android.bp
index 8392db7..dd5859c 100644
--- a/hostsidetests/jvmti/run-tests/test-907/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-907/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest907DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-908/Android.bp b/hostsidetests/jvmti/run-tests/test-908/Android.bp
index b5c0660..3837c79 100644
--- a/hostsidetests/jvmti/run-tests/test-908/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-908/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest908DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-910/Android.bp b/hostsidetests/jvmti/run-tests/test-910/Android.bp
index e79fd71..8b717ec 100644
--- a/hostsidetests/jvmti/run-tests/test-910/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-910/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest910DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-911/Android.bp b/hostsidetests/jvmti/run-tests/test-911/Android.bp
index d424e67..a9e859e 100644
--- a/hostsidetests/jvmti/run-tests/test-911/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-911/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest911DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-912/Android.bp b/hostsidetests/jvmti/run-tests/test-912/Android.bp
index 8b2b487..765d95d 100644
--- a/hostsidetests/jvmti/run-tests/test-912/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-912/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest912DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-913/Android.bp b/hostsidetests/jvmti/run-tests/test-913/Android.bp
index 234e793..28d9d95a 100644
--- a/hostsidetests/jvmti/run-tests/test-913/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-913/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest913DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-914/Android.bp b/hostsidetests/jvmti/run-tests/test-914/Android.bp
index ad7e240..2f80ca7 100644
--- a/hostsidetests/jvmti/run-tests/test-914/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-914/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest914DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-915/Android.bp b/hostsidetests/jvmti/run-tests/test-915/Android.bp
index 48c51df..a316154 100644
--- a/hostsidetests/jvmti/run-tests/test-915/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-915/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest915DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-917/Android.bp b/hostsidetests/jvmti/run-tests/test-917/Android.bp
index d67a8da..c26d916 100644
--- a/hostsidetests/jvmti/run-tests/test-917/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-917/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest917DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-918/Android.bp b/hostsidetests/jvmti/run-tests/test-918/Android.bp
index 057af6c..193fe2b 100644
--- a/hostsidetests/jvmti/run-tests/test-918/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-918/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest918DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-919/Android.bp b/hostsidetests/jvmti/run-tests/test-919/Android.bp
index 2bd54f4..2c3d12d 100644
--- a/hostsidetests/jvmti/run-tests/test-919/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-919/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest919DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-920/Android.bp b/hostsidetests/jvmti/run-tests/test-920/Android.bp
index 6fa85bf..25bee668 100644
--- a/hostsidetests/jvmti/run-tests/test-920/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-920/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest920DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-922/Android.bp b/hostsidetests/jvmti/run-tests/test-922/Android.bp
index 953c964..4629fbc 100644
--- a/hostsidetests/jvmti/run-tests/test-922/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-922/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest922DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-923/Android.bp b/hostsidetests/jvmti/run-tests/test-923/Android.bp
index 570fce6..24ca2dc 100644
--- a/hostsidetests/jvmti/run-tests/test-923/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-923/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest923DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-924/Android.bp b/hostsidetests/jvmti/run-tests/test-924/Android.bp
index 86f56e2..118f711 100644
--- a/hostsidetests/jvmti/run-tests/test-924/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-924/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest924DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-926/Android.bp b/hostsidetests/jvmti/run-tests/test-926/Android.bp
index a566ec3..c56a334 100644
--- a/hostsidetests/jvmti/run-tests/test-926/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-926/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest926DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-927/Android.bp b/hostsidetests/jvmti/run-tests/test-927/Android.bp
index a2172d6..572b893 100644
--- a/hostsidetests/jvmti/run-tests/test-927/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-927/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest927DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-928/Android.bp b/hostsidetests/jvmti/run-tests/test-928/Android.bp
index 2e51186..80ec3c7 100644
--- a/hostsidetests/jvmti/run-tests/test-928/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-928/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest928DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-930/Android.bp b/hostsidetests/jvmti/run-tests/test-930/Android.bp
index 34b192b..bd76877 100644
--- a/hostsidetests/jvmti/run-tests/test-930/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-930/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest930DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-931/Android.bp b/hostsidetests/jvmti/run-tests/test-931/Android.bp
index 5d90d1d..c722fb6 100644
--- a/hostsidetests/jvmti/run-tests/test-931/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-931/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest931DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-932/Android.bp b/hostsidetests/jvmti/run-tests/test-932/Android.bp
index 587be7c..8614c27 100644
--- a/hostsidetests/jvmti/run-tests/test-932/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-932/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest932DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-940/Android.bp b/hostsidetests/jvmti/run-tests/test-940/Android.bp
index 942ddb3..5e0ccc8 100644
--- a/hostsidetests/jvmti/run-tests/test-940/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-940/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest940DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-942/Android.bp b/hostsidetests/jvmti/run-tests/test-942/Android.bp
index 261192d..3317a23 100644
--- a/hostsidetests/jvmti/run-tests/test-942/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-942/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest942DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-944/Android.bp b/hostsidetests/jvmti/run-tests/test-944/Android.bp
index aa59cf8..ce42f1e 100644
--- a/hostsidetests/jvmti/run-tests/test-944/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-944/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest944DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-945/Android.bp b/hostsidetests/jvmti/run-tests/test-945/Android.bp
index fdf288a..f129a12 100644
--- a/hostsidetests/jvmti/run-tests/test-945/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-945/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest945DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-947/Android.bp b/hostsidetests/jvmti/run-tests/test-947/Android.bp
index ed5334d..cb76f33 100644
--- a/hostsidetests/jvmti/run-tests/test-947/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-947/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest947DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-951/Android.bp b/hostsidetests/jvmti/run-tests/test-951/Android.bp
index ddcb1f4..12d7d11 100644
--- a/hostsidetests/jvmti/run-tests/test-951/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-951/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest951DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-982/Android.bp b/hostsidetests/jvmti/run-tests/test-982/Android.bp
index 8c9d15b..610e95e 100644
--- a/hostsidetests/jvmti/run-tests/test-982/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-982/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest982DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-983/Android.bp b/hostsidetests/jvmti/run-tests/test-983/Android.bp
index 8d96923..7a2a7f4 100644
--- a/hostsidetests/jvmti/run-tests/test-983/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-983/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest983DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-984/Android.bp b/hostsidetests/jvmti/run-tests/test-984/Android.bp
index 13c2f40..e3439b4 100644
--- a/hostsidetests/jvmti/run-tests/test-984/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-984/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest984DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-985/Android.bp b/hostsidetests/jvmti/run-tests/test-985/Android.bp
index 8b60d2a..9c03dea 100644
--- a/hostsidetests/jvmti/run-tests/test-985/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-985/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest985DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-986/Android.bp b/hostsidetests/jvmti/run-tests/test-986/Android.bp
index fbba23b..4c16b57 100644
--- a/hostsidetests/jvmti/run-tests/test-986/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-986/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest986DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-988/Android.bp b/hostsidetests/jvmti/run-tests/test-988/Android.bp
index 7542a44..8493a0f 100644
--- a/hostsidetests/jvmti/run-tests/test-988/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-988/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest988DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-989/Android.bp b/hostsidetests/jvmti/run-tests/test-989/Android.bp
index 7ed2a24..ddca92c 100644
--- a/hostsidetests/jvmti/run-tests/test-989/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-989/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest989DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-990/Android.bp b/hostsidetests/jvmti/run-tests/test-990/Android.bp
index efc2c85..a77521f 100644
--- a/hostsidetests/jvmti/run-tests/test-990/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-990/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest990DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-991/Android.bp b/hostsidetests/jvmti/run-tests/test-991/Android.bp
index 44f35c6..55fcb62 100644
--- a/hostsidetests/jvmti/run-tests/test-991/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-991/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest991DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-992/Android.bp b/hostsidetests/jvmti/run-tests/test-992/Android.bp
index b1da90d..a05e992 100644
--- a/hostsidetests/jvmti/run-tests/test-992/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-992/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest992DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-993/Android.bp b/hostsidetests/jvmti/run-tests/test-993/Android.bp
index 97af792..bad6f70 100644
--- a/hostsidetests/jvmti/run-tests/test-993/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-993/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest993DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-994/Android.bp b/hostsidetests/jvmti/run-tests/test-994/Android.bp
index 7078559..444f704 100644
--- a/hostsidetests/jvmti/run-tests/test-994/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-994/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest994DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-995/Android.bp b/hostsidetests/jvmti/run-tests/test-995/Android.bp
index 7ea433c..068a54a 100644
--- a/hostsidetests/jvmti/run-tests/test-995/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-995/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest995DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-996/Android.bp b/hostsidetests/jvmti/run-tests/test-996/Android.bp
index e3fe64c..48c83c6 100644
--- a/hostsidetests/jvmti/run-tests/test-996/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-996/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest996DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-997/Android.bp b/hostsidetests/jvmti/run-tests/test-997/Android.bp
index f128d2a..c1bfabf 100644
--- a/hostsidetests/jvmti/run-tests/test-997/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-997/Android.bp
@@ -18,7 +18,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest997DeviceApp"],
diff --git a/hostsidetests/jvmti/tagging/Android.bp b/hostsidetests/jvmti/tagging/Android.bp
index 8ebced1..e0b0d32 100644
--- a/hostsidetests/jvmti/tagging/Android.bp
+++ b/hostsidetests/jvmti/tagging/Android.bp
@@ -19,7 +19,6 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
data: [":CtsJvmtiTaggingDeviceApp"],
diff --git a/hostsidetests/media/Android.bp b/hostsidetests/media/Android.bp
index 635c5c2..053a101 100644
--- a/hostsidetests/media/Android.bp
+++ b/hostsidetests/media/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/hostsidetests/media/app/MediaSessionTest/Android.bp b/hostsidetests/media/app/MediaSessionTest/Android.bp
index cfa68b1..b21a6da 100644
--- a/hostsidetests/media/app/MediaSessionTest/Android.bp
+++ b/hostsidetests/media/app/MediaSessionTest/Android.bp
@@ -17,7 +17,6 @@
defaults: ["cts_defaults"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/media/app/MediaSessionTestHelper/Android.bp b/hostsidetests/media/app/MediaSessionTestHelper/Android.bp
index 106e862..d6e141f 100644
--- a/hostsidetests/media/app/MediaSessionTestHelper/Android.bp
+++ b/hostsidetests/media/app/MediaSessionTestHelper/Android.bp
@@ -22,7 +22,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/media/bitstreams/Android.bp b/hostsidetests/media/bitstreams/Android.bp
index f13984e..aa40e61 100644
--- a/hostsidetests/media/bitstreams/Android.bp
+++ b/hostsidetests/media/bitstreams/Android.bp
@@ -28,7 +28,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
java_resources: ["DynamicConfig.xml"],
diff --git a/hostsidetests/media/bitstreams/app/Android.bp b/hostsidetests/media/bitstreams/app/Android.bp
index 0934b38..477da98 100644
--- a/hostsidetests/media/bitstreams/app/Android.bp
+++ b/hostsidetests/media/bitstreams/app/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/monkey/Android.bp b/hostsidetests/monkey/Android.bp
index 7f29b1c..102e9ae 100644
--- a/hostsidetests/monkey/Android.bp
+++ b/hostsidetests/monkey/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp b/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp
index 8110d80..be2766e 100644
--- a/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp
+++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp
index 20e8b20..debb8f6 100644
--- a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp
+++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/multiuser/Android.bp b/hostsidetests/multiuser/Android.bp
index 3f3b0f8..1543686 100644
--- a/hostsidetests/multiuser/Android.bp
+++ b/hostsidetests/multiuser/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/net/Android.bp b/hostsidetests/net/Android.bp
index 741c961..47b114b 100644
--- a/hostsidetests/net/Android.bp
+++ b/hostsidetests/net/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/net/app/Android.bp b/hostsidetests/net/app/Android.bp
index e129be7..9903756 100644
--- a/hostsidetests/net/app/Android.bp
+++ b/hostsidetests/net/app/Android.bp
@@ -35,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/net/app2/Android.bp b/hostsidetests/net/app2/Android.bp
index a6e9b11..8e27931 100644
--- a/hostsidetests/net/app2/Android.bp
+++ b/hostsidetests/net/app2/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-net-app",
diff --git a/hostsidetests/numberblocking/Android.bp b/hostsidetests/numberblocking/Android.bp
index fea09b4..8f7563f 100644
--- a/hostsidetests/numberblocking/Android.bp
+++ b/hostsidetests/numberblocking/Android.bp
@@ -18,7 +18,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/numberblocking/app/Android.bp b/hostsidetests/numberblocking/app/Android.bp
index 3dd2028..653121d 100644
--- a/hostsidetests/numberblocking/app/Android.bp
+++ b/hostsidetests/numberblocking/app/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/os/Android.bp b/hostsidetests/os/Android.bp
index 997bfb9..dabbcbe 100644
--- a/hostsidetests/os/Android.bp
+++ b/hostsidetests/os/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/app/Android.bp b/hostsidetests/os/app/Android.bp
index 9612332..c240299 100644
--- a/hostsidetests/os/app/Android.bp
+++ b/hostsidetests/os/app/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/EnvironmentTestApp/Android.bp b/hostsidetests/os/test-apps/EnvironmentTestApp/Android.bp
index d6020f2..ea30d9c 100644
--- a/hostsidetests/os/test-apps/EnvironmentTestApp/Android.bp
+++ b/hostsidetests/os/test-apps/EnvironmentTestApp/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp
index 5f63d50..6b89473 100644
--- a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp
+++ b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp b/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp
index 73d747c..a465c17 100644
--- a/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp
+++ b/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
"cts_instant",
],
diff --git a/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp b/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp
index 79f5a3f..e8cf353 100644
--- a/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp
+++ b/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp b/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp
index ef6a272..4b71269 100644
--- a/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp
+++ b/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp
index 9ac5b1e..b95f392 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp
@@ -26,7 +26,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp
index a11c386..f2a40dd 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp
index 2c55229..95b497c 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp
index fe1e3f7..99c1bd5 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp
@@ -22,7 +22,6 @@
certificate: ":cts-keyset-test-b",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp
index 0a79366..d16ac9b 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-keyset-test-b",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp
index bae3285..4919e6b 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp
@@ -20,7 +20,6 @@
certificate: ":cts-keyset-test-b",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp
index f649fb9..83226d0 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-keyset-test-a",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp
index 25452c6..aa549ff 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-keyset-test-b",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp
index 6cf004b..3827722 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-keyset-test-b",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp
index 64fe8a4..8a2388d 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp
@@ -23,7 +23,6 @@
additional_certificates: [":cts-keyset-test-a"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp
index faef230..b3ee2aa 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp
@@ -21,7 +21,6 @@
certificate: ":cts-keyset-test-b",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp
index 547416a..d41aabe 100644
--- a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp
@@ -24,7 +24,6 @@
compile_multilib: "both",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp
index 96525d0..76e2fd5 100644
--- a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp
@@ -21,7 +21,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp
index 44dc1a3..3062d9e 100644
--- a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp
@@ -21,7 +21,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/packagemanager/codepath/Android.bp b/hostsidetests/packagemanager/codepath/Android.bp
index 1a33ab0..059f3c6 100644
--- a/hostsidetests/packagemanager/codepath/Android.bp
+++ b/hostsidetests/packagemanager/codepath/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/packagemanager/codepath/app/Android.bp b/hostsidetests/packagemanager/codepath/app/Android.bp
index 20c5dcf..fc71169 100644
--- a/hostsidetests/packagemanager/codepath/app/Android.bp
+++ b/hostsidetests/packagemanager/codepath/app/Android.bp
@@ -20,7 +20,6 @@
srcs: ["src/**/*.java",],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/packagemanager/dynamicmime/Android.bp b/hostsidetests/packagemanager/dynamicmime/Android.bp
index 0f8938b..3608b51 100644
--- a/hostsidetests/packagemanager/dynamicmime/Android.bp
+++ b/hostsidetests/packagemanager/dynamicmime/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/packagemanager/dynamicmime/app/Android.bp b/hostsidetests/packagemanager/dynamicmime/app/Android.bp
index 9a92556..21fcf05 100644
--- a/hostsidetests/packagemanager/dynamicmime/app/Android.bp
+++ b/hostsidetests/packagemanager/dynamicmime/app/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -35,7 +34,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -50,7 +48,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -65,7 +62,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -80,7 +76,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/packagemanager/dynamicmime/test/Android.bp b/hostsidetests/packagemanager/dynamicmime/test/Android.bp
index 2816450..b8f2122 100644
--- a/hostsidetests/packagemanager/dynamicmime/test/Android.bp
+++ b/hostsidetests/packagemanager/dynamicmime/test/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/packagemanager/extractnativelibs/Android.bp b/hostsidetests/packagemanager/extractnativelibs/Android.bp
index 34c4a4d..634b40d 100644
--- a/hostsidetests/packagemanager/extractnativelibs/Android.bp
+++ b/hostsidetests/packagemanager/extractnativelibs/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp b/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
index 656938e..5ae4dd3 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
@@ -33,7 +33,6 @@
manifest: "app_no_extract/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
jni_libs: [
@@ -53,7 +52,6 @@
manifest: "app_extract/AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
jni_libs: [
diff --git a/hostsidetests/rollback/Android.bp b/hostsidetests/rollback/Android.bp
index d88b3fa..d58bc93 100644
--- a/hostsidetests/rollback/Android.bp
+++ b/hostsidetests/rollback/Android.bp
@@ -16,7 +16,9 @@
name: "CtsRollbackManagerHostTestCases",
defaults: ["cts_defaults"],
srcs: ["src/**/*.java"],
- libs: ["cts-tradefed", "cts-shim-host-lib", "tradefed", "truth-prebuilt"],
+ libs: [
+ "cts-tradefed", "cts-shim-host-lib", "tradefed", "truth-prebuilt", "cts-install-lib-host"
+ ],
data: [":CtsRollbackManagerHostTestHelperApp", ":CtsRollbackManagerHostTestHelperApp2"],
test_suites: ["cts", "general-tests"],
}
diff --git a/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java b/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
index 129ffb6..76de24a 100644
--- a/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
+++ b/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
@@ -650,13 +650,6 @@
assertThat(RollbackUtils.getRollbackManager().getAvailableRollbacks()).isEmpty();
}
- @Test
- public void isCheckpointSupported() {
- Context context = InstrumentationRegistry.getInstrumentation().getContext();
- StorageManager sm = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
- assertThat(sm.isCheckpointSupported()).isTrue();
- }
-
/**
* Record the versions of Apk in shim apex and PrivApk in shim apex
* in the order into {@link #APK_VERSION_FILENAME}.
diff --git a/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java b/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
index b8333ec..d29cc41 100644
--- a/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
+++ b/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
@@ -25,6 +25,7 @@
import static org.junit.Assume.assumeThat;
import static org.junit.Assume.assumeTrue;
+import com.android.cts.install.lib.host.InstallUtilsHost;
import com.android.ddmlib.Log;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
@@ -43,6 +44,7 @@
public class RollbackManagerHostTest extends BaseHostJUnit4Test {
private static final String TAG = "RollbackManagerHostTest";
+ private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this);
/**
* Runs the helper app test method on device.
@@ -67,20 +69,13 @@
}
/**
- * Return {@code true} if and only if device supports updating apex.
- */
- private boolean isApexUpdateSupported() throws Exception {
- return "true".equals(getDevice().getProperty("ro.apex.updatable"));
- }
-
- /**
* Uninstalls a shim apex only if it's latest version is installed on /data partition (i.e.
* it has a version higher than {@code 1}).
*
* <p>This is purely to optimize tests run time, since uninstalling an apex requires a reboot.
*/
private void uninstallShimApexIfNecessary() throws Exception {
- if (!isApexUpdateSupported()) {
+ if (!mHostUtils.isApexUpdateSupported()) {
// Device doesn't support updating apex. Nothing to uninstall.
return;
}
@@ -106,15 +101,6 @@
() -> new AssertionError("Can't find " + SHIM_APEX_PACKAGE_NAME));
}
- private boolean isCheckpointSupported() throws Exception {
- try {
- run("isCheckpointSupported");
- return true;
- } catch (AssertionError ignore) {
- return false;
- }
- }
-
/**
* Uninstalls any version greater than 1 of shim apex and reboots the device if necessary
* to complete the uninstall.
@@ -151,7 +137,9 @@
*/
@Test
public void testApkOnlyMultipleStagedRollback() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
run("testApkOnlyMultipleStagedRollback_Phase1");
getDevice().reboot();
run("testApkOnlyMultipleStagedRollback_Phase2");
@@ -164,7 +152,9 @@
*/
@Test
public void testApkOnlyMultipleStagedPartialRollback() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
run("testApkOnlyMultipleStagedPartialRollback_Phase1");
getDevice().reboot();
run("testApkOnlyMultipleStagedPartialRollback_Phase2");
@@ -177,7 +167,7 @@
*/
@Test
public void testApexOnlyStagedRollback() throws Exception {
- assumeTrue("Device does not support updating APEX", isApexUpdateSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
run("testApexOnlyStagedRollback_Phase1");
getDevice().reboot();
@@ -193,7 +183,7 @@
*/
@Test
public void testApexOnlySystemVersionStagedRollback() throws Exception {
- assumeTrue("Device does not support updating APEX", isApexUpdateSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
run("testApexOnlySystemVersionStagedRollback_Phase1");
getDevice().reboot();
@@ -207,7 +197,7 @@
*/
@Test
public void testApexAndApkStagedRollback() throws Exception {
- assumeTrue("Device does not support updating APEX", isApexUpdateSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
run("testApexAndApkStagedRollback_Phase1");
getDevice().reboot();
@@ -223,7 +213,7 @@
*/
@Test
public void testApexRollbackExpiration() throws Exception {
- assumeTrue("Device does not support updating APEX", isApexUpdateSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
run("testApexRollbackExpiration_Phase1");
getDevice().reboot();
@@ -237,7 +227,7 @@
*/
@Test
public void testApexKeyRotationStagedRollback() throws Exception {
- assumeTrue("Device does not support updating APEX", isApexUpdateSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
run("testApexKeyRotationStagedRollback_Phase1");
getDevice().reboot();
diff --git a/hostsidetests/sample/Android.bp b/hostsidetests/sample/Android.bp
index 514085b..781babd 100644
--- a/hostsidetests/sample/Android.bp
+++ b/hostsidetests/sample/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/seccomp/Android.bp b/hostsidetests/seccomp/Android.bp
index 273b95d..5280d2a 100644
--- a/hostsidetests/seccomp/Android.bp
+++ b/hostsidetests/seccomp/Android.bp
@@ -18,7 +18,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/seccomp/app/Android.bp b/hostsidetests/seccomp/app/Android.bp
index e2444bd..55fb375 100644
--- a/hostsidetests/seccomp/app/Android.bp
+++ b/hostsidetests/seccomp/app/Android.bp
@@ -30,7 +30,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/security/Android.mk b/hostsidetests/security/Android.mk
index 93c3efa..0a6373a 100644
--- a/hostsidetests/security/Android.mk
+++ b/hostsidetests/security/Android.mk
@@ -21,7 +21,7 @@
LOCAL_MODULE_TAGS := optional
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
# Must match the package name in CtsTestCaseList.mk
LOCAL_MODULE := CtsSecurityHostTestCases
diff --git a/hostsidetests/securitybulletin/Android.bp b/hostsidetests/securitybulletin/Android.bp
index f17395e..5da0687 100644
--- a/hostsidetests/securitybulletin/Android.bp
+++ b/hostsidetests/securitybulletin/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"sts",
],
@@ -50,7 +49,6 @@
},
test_suites: [
"cts",
- "vts10",
"sts",
],
cflags: [
diff --git a/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp b/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp
index 0e619a8..6d05ddd 100644
--- a/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp
+++ b/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"sts",
],
optimize: {
diff --git a/hostsidetests/settings/Android.bp b/hostsidetests/settings/Android.bp
index dccd1c9..164beee 100644
--- a/hostsidetests/settings/Android.bp
+++ b/hostsidetests/settings/Android.bp
@@ -29,6 +29,5 @@
"arcts",
"cts",
"general-tests",
- "vts10",
],
}
diff --git a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
index e4ebc58..5fd8e6b 100644
--- a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
+++ b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
@@ -38,7 +38,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp
index 008ac13..98df20f 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp
index 38b57c4..e6f48a2 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp
index 15466fa..ab286df 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp
index da08d5b..aa3228f 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp
index a362f7f..96672d6 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp
index e2b91f5..4a82860 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp
index 2a0e687..d64693f 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp
index 9cefd3c..f5eaff7 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp
index 63cca81..7abb9de 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp
index 8d43503..28e0a5c 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp
index 8d1b6d8..85c6815 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp
index 24812de..0837f42 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp
index 2eb6984..96630fc 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp
index 32d27dd..d48db7b 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/multiuser/Android.bp b/hostsidetests/shortcuts/deviceside/multiuser/Android.bp
index 7619b6c..dcbdabd 100644
--- a/hostsidetests/shortcuts/deviceside/multiuser/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/multiuser/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/shortcuts/deviceside/upgrade/Android.bp b/hostsidetests/shortcuts/deviceside/upgrade/Android.bp
index 658845a..d664097 100644
--- a/hostsidetests/shortcuts/deviceside/upgrade/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/upgrade/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
@@ -41,7 +40,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/shortcuts/hostside/Android.bp b/hostsidetests/shortcuts/hostside/Android.bp
index 3613975..b6ff84f 100644
--- a/hostsidetests/shortcuts/hostside/Android.bp
+++ b/hostsidetests/shortcuts/hostside/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
required: [
diff --git a/hostsidetests/signedconfig/app/Android.bp b/hostsidetests/signedconfig/app/Android.bp
index 3fe178a..e47f9b7 100644
--- a/hostsidetests/signedconfig/app/Android.bp
+++ b/hostsidetests/signedconfig/app/Android.bp
@@ -31,7 +31,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -42,7 +41,6 @@
manifest: "version1_instant_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -53,7 +51,6 @@
manifest: "version2_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -64,7 +61,6 @@
manifest: "version2_instant_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -75,7 +71,6 @@
manifest: "version1_package2_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -86,7 +81,6 @@
manifest: "version2_package2_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -97,7 +91,6 @@
manifest: "version1_badsignature_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -108,7 +101,6 @@
manifest: "version1_badb64_config_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -119,7 +111,6 @@
manifest: "version1_badb64_signature_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -130,7 +121,6 @@
manifest: "version3_configv1_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -141,7 +131,6 @@
manifest: "version1_debug_key_AndroidManifest.xml",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/signedconfig/app/build_signedconfig_apk.mk b/hostsidetests/signedconfig/app/build_signedconfig_apk.mk
index 1eb6a66..a467eaa 100644
--- a/hostsidetests/signedconfig/app/build_signedconfig_apk.mk
+++ b/hostsidetests/signedconfig/app/build_signedconfig_apk.mk
@@ -17,7 +17,7 @@
LOCAL_MODULE_PATH = $(TARGET_OUT_DATA_APPS)
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_DEX_PREOPT := false
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_PACKAGE)
diff --git a/hostsidetests/signedconfig/hostside/Android.bp b/hostsidetests/signedconfig/hostside/Android.bp
index 5eda91c..ebb4aaa 100644
--- a/hostsidetests/signedconfig/hostside/Android.bp
+++ b/hostsidetests/signedconfig/hostside/Android.bp
@@ -27,7 +27,6 @@
static_libs: ["hamcrest-library"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/stagedinstall/Android.bp b/hostsidetests/stagedinstall/Android.bp
index 6a463a1..3e87531 100644
--- a/hostsidetests/stagedinstall/Android.bp
+++ b/hostsidetests/stagedinstall/Android.bp
@@ -15,9 +15,7 @@
java_test_host {
name: "CtsStagedInstallHostTestCases",
defaults: ["cts_defaults"],
-
srcs: ["src/**/*.java"],
-
libs: [
"cts-tradefed",
"cts-shim-host-lib",
@@ -26,12 +24,11 @@
"hamcrest",
"hamcrest-library",
],
-
+ static_libs: ["cts-install-lib-host"],
data: [
":StagedInstallTest",
":deapexer.zip",
],
-
test_suites: [
"cts",
"general-tests",
@@ -41,11 +38,8 @@
android_test_helper_app {
name: "StagedInstallTest",
-
srcs: ["app/src/**/*.java"],
-
manifest : "app/AndroidManifest.xml",
-
java_resources: [
":ApexKeyRotationTestV2_SignedBob",
":ApexKeyRotationTestV2_SignedBobRot",
diff --git a/hostsidetests/stagedinstall/OWNERS b/hostsidetests/stagedinstall/OWNERS
index 2dd1076..1bccb47 100644
--- a/hostsidetests/stagedinstall/OWNERS
+++ b/hostsidetests/stagedinstall/OWNERS
@@ -4,3 +4,4 @@
narayan@google.com
patb@google.com
ioffe@google.com
+olilan@google.com
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
index 8615e4b..223a4ba 100644
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
@@ -37,7 +37,6 @@
import android.content.pm.PackageManager;
import android.os.Handler;
import android.os.HandlerThread;
-import android.os.storage.StorageManager;
import android.util.Log;
import androidx.test.platform.app.InstrumentationRegistry;
@@ -1438,11 +1437,4 @@
TimeUnit.SECONDS);
assertThat(info).isNull();
}
-
- @Test
- public void isCheckpointSupported() {
- Context context = InstrumentationRegistry.getInstrumentation().getContext();
- StorageManager sm = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
- assertThat(sm.isCheckpointSupported()).isTrue();
- }
}
diff --git a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
index 31b53dd..36a67e1 100644
--- a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
+++ b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
@@ -27,6 +27,7 @@
import android.platform.test.annotations.LargeTest;
+import com.android.cts.install.lib.host.InstallUtilsHost;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.util.AaptParser;
@@ -67,6 +68,8 @@
@RunWith(DeviceJUnit4ClassRunner.class)
public class ApexShimValidationTest extends BaseHostJUnit4Test {
+ private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this);
+
private static final String SHIM_APK_CODE_PATH_PREFIX = "/apex/" + SHIM_APEX_PACKAGE_NAME + "/";
private static final String STAGED_INSTALL_TEST_FILE_NAME = "StagedInstallTest.apk";
private static final String APEX_FILE_SUFFIX = ".apex";
@@ -107,8 +110,8 @@
@Before
public void setUp() throws Exception {
- final String updatable = getDevice().getProperty("ro.apex.updatable");
- assumeThat("Device doesn't support updating APEX", updatable, CoreMatchers.equalTo("true"));
+ assumeThat("Device doesn't support updating APEX", mHostUtils.isApexUpdateSupported(),
+ CoreMatchers.equalTo("true"));
cleanUp();
mDeapexerZip = getTestInformation().getDependencyFile(DEAPEXER_ZIP_FILE_NAME, false);
mAllApexesZip = getTestInformation().getDependencyFile(STAGED_INSTALL_TEST_FILE_NAME,
diff --git a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
index a2efd48..9448315 100644
--- a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
@@ -29,6 +29,7 @@
import android.platform.test.annotations.LargeTest;
+import com.android.cts.install.lib.host.InstallUtilsHost;
import com.android.ddmlib.Log;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
@@ -53,6 +54,8 @@
private static final String BROADCAST_RECEIVER_COMPONENT = PACKAGE_NAME + "/"
+ PACKAGE_NAME + ".LauncherActivity";
+ private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this);
+
private String mDefaultLauncher = null;
@Rule
@@ -133,19 +136,19 @@
@Test
public void testStageAnotherSessionImmediatelyAfterAbandon() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testStageAnotherSessionImmediatelyAfterAbandon");
}
@Test
public void testStageAnotherSessionImmediatelyAfterAbandonMultiPackage() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testStageAnotherSessionImmediatelyAfterAbandonMultiPackage");
}
@Test
public void testNoSessionUpdatedBroadcastSentForStagedSessionAbandon() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testNoSessionUpdatedBroadcastSentForStagedSessionAbandon");
}
@@ -168,7 +171,9 @@
@Test
public void testGetActiveStagedSessions() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testGetActiveStagedSessions");
}
@@ -188,7 +193,9 @@
@Test
public void testGetActiveStagedSessions_MultiApkSession() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testGetActiveStagedSessions_MultiApkSession");
}
@@ -215,7 +222,7 @@
@Test
public void testShimApexShouldPreInstalledIfUpdatingApexIsSupported() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
final ITestDevice.ApexInfo shimApex = getShimApex();
assertThat(shimApex.versionCode).isEqualTo(1);
@@ -224,7 +231,7 @@
@Test
@LargeTest
public void testInstallStagedApex() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
setDefaultLauncher(BROADCAST_RECEIVER_COMPONENT);
runPhase("testInstallStagedApex_Commit");
@@ -235,7 +242,7 @@
@Test
// Don't mark as @LargeTest since we want at least one test to install apex during pre-submit.
public void testInstallStagedApexAndApk() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
setDefaultLauncher(BROADCAST_RECEIVER_COMPONENT);
runPhase("testInstallStagedApexAndApk_Commit");
@@ -245,21 +252,21 @@
@Test
public void testsFailsNonStagedApexInstall() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testsFailsNonStagedApexInstall");
}
@Test
public void testInstallStagedNonPreInstalledApex_Fails() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testInstallStagedNonPreInstalledApex_Fails");
}
@Test
public void testInstallStagedDifferentPackageNameWithInstalledApex_Fails() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testInstallStagedDifferentPackageNameWithInstalledApex_Fails");
}
@@ -267,7 +274,7 @@
@Test
@LargeTest
public void testStageApkWithSameNameAsApexShouldFail() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testStageApkWithSameNameAsApexShouldFail_Commit");
getDevice().reboot();
@@ -276,14 +283,14 @@
@Test
public void testNonStagedInstallApkWithSameNameAsApexShouldFail() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testNonStagedInstallApkWithSameNameAsApexShouldFail");
}
@Test
@LargeTest
public void testStagedInstallDowngradeApex_DowngradeNotRequested_Fails() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV3Apex();
runPhase("testStagedInstallDowngradeApex_DowngradeNotRequested_Fails_Commit");
@@ -295,7 +302,7 @@
@LargeTest
public void testStagedInstallDowngradeApex_DowngradeRequested_DebugBuild() throws Exception {
assumeThat(getDevice().getBuildFlavor(), not(endsWith("-user")));
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV3Apex();
runPhase("testStagedInstallDowngradeApex_DowngradeRequested_DebugBuild_Commit");
@@ -308,7 +315,7 @@
public void testStagedInstallDowngradeApex_DowngradeRequested_UserBuild_Fails()
throws Exception {
assumeThat(getDevice().getBuildFlavor(), endsWith("-user"));
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV3Apex();
runPhase("testStagedInstallDowngradeApex_DowngradeRequested_UserBuild_Fails_Commit");
@@ -321,7 +328,7 @@
@LargeTest
public void testStagedInstallDowngradeApexToSystemVersion_DebugBuild() throws Exception {
assumeThat(getDevice().getBuildFlavor(), not(endsWith("-user")));
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV2Apex();
runPhase("testStagedInstallDowngradeApexToSystemVersion_DebugBuild_Commit");
@@ -332,7 +339,7 @@
@Test
@LargeTest
public void testInstallStagedApex_SameGrade() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV3Apex();
installV3Apex();
}
@@ -340,7 +347,7 @@
@Test
@LargeTest
public void testInstallStagedApex_SameGrade_NewOneWins() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV2Apex();
@@ -351,7 +358,7 @@
@Test
public void testInstallApex_DeviceDoesNotSupportApex_Fails() throws Exception {
- assumeFalse("Device supports updating APEX", isUpdatingApexSupported());
+ assumeFalse("Device supports updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testInstallApex_DeviceDoesNotSupportApex_Fails");
}
@@ -376,7 +383,7 @@
@Test
public void testFailsInvalidApexInstall() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testFailsInvalidApexInstall_Commit");
runPhase("testFailsInvalidApexInstall_AbandonSessionIsNoop");
}
@@ -389,7 +396,7 @@
@Test
@LargeTest
public void testInstallStagedApexWithoutApexSuffix() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testInstallStagedApexWithoutApexSuffix_Commit");
getDevice().reboot();
@@ -398,7 +405,7 @@
@Test
public void testRejectsApexDifferentCertificate() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testRejectsApexDifferentCertificate");
}
@@ -418,7 +425,7 @@
// Should not be able to update with a key that has not been rotated.
@Test
public void testUpdateWithDifferentKeyButNoRotation() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testUpdateWithDifferentKeyButNoRotation");
}
@@ -427,7 +434,7 @@
@Test
@LargeTest
public void testUpdateWithDifferentKey() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testUpdateWithDifferentKey_Commit");
getDevice().reboot();
@@ -439,7 +446,7 @@
@Test
@LargeTest
public void testUntrustedOldKeyIsRejected() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV2SignedBobApex();
runPhase("testUntrustedOldKeyIsRejected");
@@ -449,7 +456,7 @@
@Test
@LargeTest
public void testTrustedOldKeyIsAccepted() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testTrustedOldKeyIsAccepted_Commit");
getDevice().reboot();
@@ -462,7 +469,7 @@
@Test
@LargeTest
public void testAfterRotationNewKeyCanUpdateFurther() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV2SignedBobApex();
runPhase("testAfterRotationNewKeyCanUpdateFurther_CommitPostReboot");
@@ -473,7 +480,7 @@
@Test
@LargeTest
public void testAfterRotationNewKeyCanUpdateFurtherWithoutLineage() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
installV2SignedBobApex();
runPhase("testAfterRotationNewKeyCanUpdateFurtherWithoutLineage");
@@ -486,7 +493,9 @@
// Should fail to stage multiple sessions when check-point is not available
@Test
public void testFailStagingMultipleSessionsIfNoCheckPoint() throws Exception {
- assumeFalse(isCheckpointSupported());
+ assumeFalse("Device supports file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testFailStagingMultipleSessionsIfNoCheckPoint");
}
@@ -498,13 +507,17 @@
@Test
public void testAllowNonOverlappingMultipleStagedInstall_MultiPackageSinglePackage_Apk()
throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testAllowNonOverlappingMultipleStagedInstall_MultiPackageSinglePackage_Apk");
}
@Test
public void testFailOverlappingMultipleStagedInstall_BothMultiPackage_Apk() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testFailOverlappingMultipleStagedInstall_BothMultiPackage_Apk");
}
@@ -512,7 +525,9 @@
@Test
@LargeTest
public void testMultipleStagedInstall_ApkOnly() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testMultipleStagedInstall_ApkOnly_Commit");
getDevice().reboot();
runPhase("testMultipleStagedInstall_ApkOnly_VerifyPostReboot");
@@ -522,7 +537,9 @@
@Test
@LargeTest
public void testInstallMultipleStagedSession_PartialFail_ApkOnly() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testInstallMultipleStagedSession_PartialFail_ApkOnly_Commit");
getDevice().reboot();
runPhase("testInstallMultipleStagedSession_PartialFail_ApkOnly_VerifyPostReboot");
@@ -532,7 +549,9 @@
@Test
@LargeTest
public void testFailureReasonPersists_SingleSession() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testFailureReasonPersists_SingleSession_Commit");
getDevice().reboot();
runPhase("testFailureReasonPersists_SingleSession_VerifyPostReboot");
@@ -542,7 +561,9 @@
@Test
@LargeTest
public void testFailureReasonPersists_MultiSession() throws Exception {
- assumeTrue(isCheckpointSupported());
+ assumeTrue("Device does not support file-system checkpoint",
+ mHostUtils.isCheckpointSupported());
+
runPhase("testFailureReasonPersists_MultipleSession_Commit");
getDevice().reboot();
runPhase("testFailureReasonPersists_MultipleSession_VerifyPostReboot");
@@ -551,7 +572,7 @@
@Test
@LargeTest
public void testSamegradeSystemApex() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testSamegradeSystemApex_Commit");
getDevice().reboot();
@@ -576,7 +597,7 @@
@Test
@LargeTest
public void testInstallStagedNoHashtreeApex() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testInstallStagedNoHashtreeApex_Commit");
getDevice().reboot();
@@ -588,7 +609,7 @@
*/
@Test
public void testApexTargetingOldDevSdkFailsVerification() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testApexTargetingOldDevSdkFailsVerification");
}
@@ -599,7 +620,7 @@
@Test
@LargeTest
public void testApexFailsToInstallIfApkInApexFailsToScan() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testApexFailsToInstallIfApkInApexFailsToScan_Commit");
getDevice().reboot();
@@ -608,7 +629,7 @@
@Test
public void testCorruptedApexFailsVerification_b146895998() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testCorruptedApexFailsVerification_b146895998");
}
@@ -618,7 +639,7 @@
*/
@Test
public void testApexWithUnsignedApkFailsVerification() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testApexWithUnsignedApkFailsVerification");
}
@@ -628,16 +649,11 @@
*/
@Test
public void testApexWithUnsignedPayloadFailsVerification() throws Exception {
- assumeTrue("Device does not support updating APEX", isUpdatingApexSupported());
+ assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
runPhase("testApexWithUnsignedPayloadFailsVerification");
}
- private boolean isUpdatingApexSupported() throws Exception {
- final String updatable = getDevice().getProperty("ro.apex.updatable");
- return updatable != null && updatable.equals("true");
- }
-
/**
* Uninstalls a shim apex only if it's latest version is installed on /data partition (i.e.
* it has a version higher than {@code 1}).
@@ -647,7 +663,7 @@
* unnecessary reboots.
*/
private void uninstallShimApexIfNecessary() throws Exception {
- if (!isUpdatingApexSupported()) {
+ if (!mHostUtils.isApexUpdateSupported()) {
// Device doesn't support updating apex. Nothing to uninstall.
return;
}
@@ -732,13 +748,4 @@
}
}
}
-
- private boolean isCheckpointSupported() throws Exception {
- try {
- runPhase("isCheckpointSupported");
- return true;
- } catch (AssertionError ignore) {
- return false;
- }
- }
}
diff --git a/hostsidetests/statsd/Android.bp b/hostsidetests/statsd/Android.bp
index d418f42..dccd5be 100644
--- a/hostsidetests/statsd/Android.bp
+++ b/hostsidetests/statsd/Android.bp
@@ -22,7 +22,6 @@
"cts",
"general-tests",
"mts",
- "vts10",
],
libs: [
diff --git a/hostsidetests/sustainedperf/Android.mk b/hostsidetests/sustainedperf/Android.mk
index 2ff7b8a..3187415 100644
--- a/hostsidetests/sustainedperf/Android.mk
+++ b/hostsidetests/sustainedperf/Android.mk
@@ -21,7 +21,7 @@
LOCAL_MODULE_TAGS := tests
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_MODULE := CtsSustainedPerformanceHostTestCases
LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
diff --git a/hostsidetests/sustainedperf/app/Android.mk b/hostsidetests/sustainedperf/app/Android.mk
index 6fd630b..473621a 100644
--- a/hostsidetests/sustainedperf/app/Android.mk
+++ b/hostsidetests/sustainedperf/app/Android.mk
@@ -28,7 +28,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_PACKAGE_NAME := CtsSustainedPerformanceDeviceTestApp
diff --git a/hostsidetests/sustainedperf/dhrystone/Android.mk b/hostsidetests/sustainedperf/dhrystone/Android.mk
index f87770e..d86378e 100644
--- a/hostsidetests/sustainedperf/dhrystone/Android.mk
+++ b/hostsidetests/sustainedperf/dhrystone/Android.mk
@@ -15,5 +15,5 @@
LOCAL_MULTILIB := both
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_EXECUTABLE)
diff --git a/hostsidetests/sustainedperf/shadertoy_android/Android.mk b/hostsidetests/sustainedperf/shadertoy_android/Android.mk
index 7f7172a..59cc55f 100644
--- a/hostsidetests/sustainedperf/shadertoy_android/Android.mk
+++ b/hostsidetests/sustainedperf/shadertoy_android/Android.mk
@@ -34,6 +34,6 @@
LOCAL_MIN_SDK_VERSION := 5
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/systemui/Android.bp b/hostsidetests/systemui/Android.bp
index 2b07a41..506b789 100644
--- a/hostsidetests/systemui/Android.bp
+++ b/hostsidetests/systemui/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/systemui/app/Android.bp b/hostsidetests/systemui/app/Android.bp
index da1e472..fba1c1b 100644
--- a/hostsidetests/systemui/app/Android.bp
+++ b/hostsidetests/systemui/app/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp b/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp
index 055c937..306a25e 100644
--- a/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp
+++ b/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp b/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp
index 2f45522..e97729a 100644
--- a/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp
+++ b/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/tagging/Android.bp b/hostsidetests/tagging/Android.bp
index 39f9afe..7fc561f 100644
--- a/hostsidetests/tagging/Android.bp
+++ b/hostsidetests/tagging/Android.bp
@@ -41,7 +41,6 @@
test_suites: [
"cts",
"general-tests",
- "vts10",
],
}
diff --git a/hostsidetests/tagging/common/Android.bp b/hostsidetests/tagging/common/Android.bp
index b6f8eb9..3a2a0dd 100644
--- a/hostsidetests/tagging/common/Android.bp
+++ b/hostsidetests/tagging/common/Android.bp
@@ -40,7 +40,6 @@
compile_multilib: "both",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: ["tagging-common-devicesidelib"],
diff --git a/hostsidetests/tagging/manifest_disabled/Android.bp b/hostsidetests/tagging/manifest_disabled/Android.bp
index 1c8b8bd..5c10e2d 100644
--- a/hostsidetests/tagging/manifest_disabled/Android.bp
+++ b/hostsidetests/tagging/manifest_disabled/Android.bp
@@ -18,7 +18,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tagging/manifest_enabled_sdk_29/Android.bp b/hostsidetests/tagging/manifest_enabled_sdk_29/Android.bp
index 98e9e34..157f16a 100644
--- a/hostsidetests/tagging/manifest_enabled_sdk_29/Android.bp
+++ b/hostsidetests/tagging/manifest_enabled_sdk_29/Android.bp
@@ -18,7 +18,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tagging/manifest_enabled_sdk_30/Android.bp b/hostsidetests/tagging/manifest_enabled_sdk_30/Android.bp
index e9dfc6b..0fdeb36 100644
--- a/hostsidetests/tagging/manifest_enabled_sdk_30/Android.bp
+++ b/hostsidetests/tagging/manifest_enabled_sdk_30/Android.bp
@@ -18,7 +18,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tagging/sdk_29/Android.bp b/hostsidetests/tagging/sdk_29/Android.bp
index 1fd2dbc..2ee016e 100644
--- a/hostsidetests/tagging/sdk_29/Android.bp
+++ b/hostsidetests/tagging/sdk_29/Android.bp
@@ -18,7 +18,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tagging/sdk_30/Android.bp b/hostsidetests/tagging/sdk_30/Android.bp
index c1f3332..0d13db1 100644
--- a/hostsidetests/tagging/sdk_30/Android.bp
+++ b/hostsidetests/tagging/sdk_30/Android.bp
@@ -18,7 +18,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: ["compatibility-device-util-axt"],
diff --git a/hostsidetests/telephonyprovider/Android.bp b/hostsidetests/telephonyprovider/Android.bp
index e3502f1..e2f6b22 100644
--- a/hostsidetests/telephonyprovider/Android.bp
+++ b/hostsidetests/telephonyprovider/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/telephonyprovider/devicetest/Android.bp b/hostsidetests/telephonyprovider/devicetest/Android.bp
index 5208101..8a70b2e 100644
--- a/hostsidetests/telephonyprovider/devicetest/Android.bp
+++ b/hostsidetests/telephonyprovider/devicetest/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/testharness/Android.bp b/hostsidetests/testharness/Android.bp
index 999ef00..975d996 100644
--- a/hostsidetests/testharness/Android.bp
+++ b/hostsidetests/testharness/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/testharness/app/Android.bp b/hostsidetests/testharness/app/Android.bp
index ef369b6..c8ea847 100644
--- a/hostsidetests/testharness/app/Android.bp
+++ b/hostsidetests/testharness/app/Android.bp
@@ -31,7 +31,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/theme/Android.mk b/hostsidetests/theme/Android.mk
index 0a3d2de..ae32557 100644
--- a/hostsidetests/theme/Android.mk
+++ b/hostsidetests/theme/Android.mk
@@ -39,7 +39,7 @@
LOCAL_SDK_VERSION := current
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10
+LOCAL_COMPATIBILITY_SUITE := cts
include $(BUILD_CTS_HOST_JAVA_LIBRARY)
diff --git a/hostsidetests/theme/app/Android.bp b/hostsidetests/theme/app/Android.bp
index 0d21169..c534e9e 100644
--- a/hostsidetests/theme/app/Android.bp
+++ b/hostsidetests/theme/app/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/trustedvoice/Android.bp b/hostsidetests/trustedvoice/Android.bp
index 2a333d5..f20218c 100644
--- a/hostsidetests/trustedvoice/Android.bp
+++ b/hostsidetests/trustedvoice/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/trustedvoice/app/Android.bp b/hostsidetests/trustedvoice/app/Android.bp
index 3c4cc76..27ab221 100644
--- a/hostsidetests/trustedvoice/app/Android.bp
+++ b/hostsidetests/trustedvoice/app/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/tv/Android.bp b/hostsidetests/tv/Android.bp
index 6b9bd6a..7495491 100644
--- a/hostsidetests/tv/Android.bp
+++ b/hostsidetests/tv/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tv/app/Android.bp b/hostsidetests/tv/app/Android.bp
index 9617442..e929820 100644
--- a/hostsidetests/tv/app/Android.bp
+++ b/hostsidetests/tv/app/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tv/app2/Android.bp b/hostsidetests/tv/app2/Android.bp
index c94dcdc..f8af26c 100644
--- a/hostsidetests/tv/app2/Android.bp
+++ b/hostsidetests/tv/app2/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/tzdata/Android.bp b/hostsidetests/tzdata/Android.bp
index 0027228..75f5424 100644
--- a/hostsidetests/tzdata/Android.bp
+++ b/hostsidetests/tzdata/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/ui/appA/Android.bp b/hostsidetests/ui/appA/Android.bp
index 47c62ac..5497378 100644
--- a/hostsidetests/ui/appA/Android.bp
+++ b/hostsidetests/ui/appA/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/ui/appB/Android.bp b/hostsidetests/ui/appB/Android.bp
index 9bf6165..255b3de 100644
--- a/hostsidetests/ui/appB/Android.bp
+++ b/hostsidetests/ui/appB/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/ui/control/Android.bp b/hostsidetests/ui/control/Android.bp
index 481b9e8..96d16ce 100644
--- a/hostsidetests/ui/control/Android.bp
+++ b/hostsidetests/ui/control/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/usage/Android.bp b/hostsidetests/usage/Android.bp
index e5aacfd..f7e59d2 100644
--- a/hostsidetests/usage/Android.bp
+++ b/hostsidetests/usage/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/usage/app/Android.bp b/hostsidetests/usage/app/Android.bp
index 57e6fc7..55e4ac2 100644
--- a/hostsidetests/usage/app/Android.bp
+++ b/hostsidetests/usage/app/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -35,7 +34,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
diff --git a/hostsidetests/usb/Android.bp b/hostsidetests/usb/Android.bp
index 250732b..1bd848b 100644
--- a/hostsidetests/usb/Android.bp
+++ b/hostsidetests/usb/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/usb/SerialTestApp/Android.bp b/hostsidetests/usb/SerialTestApp/Android.bp
index 08c7e72..2c4a864 100644
--- a/hostsidetests/usb/SerialTestApp/Android.bp
+++ b/hostsidetests/usb/SerialTestApp/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/webkit/Android.bp b/hostsidetests/webkit/Android.bp
index ea5c9f77..53fadbd 100644
--- a/hostsidetests/webkit/Android.bp
+++ b/hostsidetests/webkit/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/webkit/app/Android.bp b/hostsidetests/webkit/app/Android.bp
index d670535..831bbb7 100644
--- a/hostsidetests/webkit/app/Android.bp
+++ b/hostsidetests/webkit/app/Android.bp
@@ -33,7 +33,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/wifibroadcasts/Android.bp b/hostsidetests/wifibroadcasts/Android.bp
index a721c78..42a3b4f 100644
--- a/hostsidetests/wifibroadcasts/Android.bp
+++ b/hostsidetests/wifibroadcasts/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/wifibroadcasts/app/Android.bp b/hostsidetests/wifibroadcasts/app/Android.bp
index 1ea4a6e..2dc0b0f 100644
--- a/hostsidetests/wifibroadcasts/app/Android.bp
+++ b/hostsidetests/wifibroadcasts/app/Android.bp
@@ -24,7 +24,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/libs/install/Android.bp b/libs/install/Android.bp
index 022bd3a..3d3d350 100644
--- a/libs/install/Android.bp
+++ b/libs/install/Android.bp
@@ -92,7 +92,7 @@
java_library {
name: "cts-install-lib-java",
- srcs: ["src/**/*.java"],
+ srcs: ["src/**/lib/*.java"],
static_libs: [
"androidx.test.rules",
"compatibility-device-util-axt",
@@ -123,3 +123,9 @@
"cts-install-lib-java",
],
}
+
+java_library_host {
+ name: "cts-install-lib-host",
+ srcs: ["src/**/host/InstallUtilsHost.java"],
+ libs: ["tradefed"],
+}
diff --git a/libs/install/src/com/android/cts/install/lib/host/InstallUtilsHost.java b/libs/install/src/com/android/cts/install/lib/host/InstallUtilsHost.java
new file mode 100644
index 0000000..41b568b
--- /dev/null
+++ b/libs/install/src/com/android/cts/install/lib/host/InstallUtilsHost.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.install.lib.host;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.util.CommandResult;
+import com.android.tradefed.util.CommandStatus;
+
+/**
+ * Utilities to facilitate installation in tests on host side.
+ */
+public class InstallUtilsHost {
+
+ private BaseHostJUnit4Test mTest;
+
+ public InstallUtilsHost(BaseHostJUnit4Test test) {
+ mTest = test;
+ }
+
+ /**
+ * Return {@code true} if and only if device supports updating apex.
+ */
+ public boolean isApexUpdateSupported() throws Exception {
+ return mTest.getDevice().getBooleanProperty("ro.apex.updatable", false);
+ }
+
+ /**
+ * Return {@code true} if and only if device supports file system checkpoint.
+ */
+ public boolean isCheckpointSupported() throws Exception {
+ CommandResult result = mTest.getDevice().executeShellV2Command("sm supports-checkpoint");
+ assertWithMessage("Failed to check if fs checkpointing is supported : %s",
+ result.getStderr()).that(result.getStatus()).isEqualTo(CommandStatus.SUCCESS);
+ return "true".equals(result.getStdout().trim());
+ }
+}
diff --git a/tests/AlarmManager/Android.bp b/tests/AlarmManager/Android.bp
index 204f5a3..ba40a70 100644
--- a/tests/AlarmManager/Android.bp
+++ b/tests/AlarmManager/Android.bp
@@ -26,7 +26,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/tests/AlarmManager/app/Android.bp b/tests/AlarmManager/app/Android.bp
index faf64a7..5a10973 100644
--- a/tests/AlarmManager/app/Android.bp
+++ b/tests/AlarmManager/app/Android.bp
@@ -18,7 +18,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/BlobStore/Android.bp b/tests/BlobStore/Android.bp
index fcf1e72..22d8791 100644
--- a/tests/BlobStore/Android.bp
+++ b/tests/BlobStore/Android.bp
@@ -30,7 +30,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current"
@@ -50,7 +49,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests"
],
manifest: "helper-app/AndroidManifest.xml",
@@ -71,7 +69,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "helper-app/AndroidManifest.xml",
@@ -96,7 +93,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "helper-app/AndroidManifest.xml",
diff --git a/tests/DropBoxManager/Android.bp b/tests/DropBoxManager/Android.bp
index 7c121ad..f13b0fe 100644
--- a/tests/DropBoxManager/Android.bp
+++ b/tests/DropBoxManager/Android.bp
@@ -23,7 +23,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/tests/JobScheduler/Android.bp b/tests/JobScheduler/Android.bp
index aa4b99f..e747694 100644
--- a/tests/JobScheduler/Android.bp
+++ b/tests/JobScheduler/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// sdk_version: "current",
diff --git a/tests/JobScheduler/JobTestApp/Android.bp b/tests/JobScheduler/JobTestApp/Android.bp
index 5db7c14..6985b18 100644
--- a/tests/JobScheduler/JobTestApp/Android.bp
+++ b/tests/JobScheduler/JobTestApp/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/JobSchedulerSharedUid/Android.bp b/tests/JobSchedulerSharedUid/Android.bp
index 6fb4343..b08b072 100644
--- a/tests/JobSchedulerSharedUid/Android.bp
+++ b/tests/JobSchedulerSharedUid/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
//sdk_version: "current"
diff --git a/tests/JobSchedulerSharedUid/JobSharedUidTestApp/Android.bp b/tests/JobSchedulerSharedUid/JobSharedUidTestApp/Android.bp
index 184e83e..a849c0a 100644
--- a/tests/JobSchedulerSharedUid/JobSharedUidTestApp/Android.bp
+++ b/tests/JobSchedulerSharedUid/JobSharedUidTestApp/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/JobSchedulerSharedUid/jobperm/Android.bp b/tests/JobSchedulerSharedUid/jobperm/Android.bp
index 3c6294f..1032247 100644
--- a/tests/JobSchedulerSharedUid/jobperm/Android.bp
+++ b/tests/JobSchedulerSharedUid/jobperm/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/tests/JobSchedulerSharedUid/shareduid/Android.bp b/tests/JobSchedulerSharedUid/shareduid/Android.bp
index 73bb119..b3a23dc 100644
--- a/tests/JobSchedulerSharedUid/shareduid/Android.bp
+++ b/tests/JobSchedulerSharedUid/shareduid/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/acceleration/Android.bp b/tests/acceleration/Android.bp
index 99a78ba..a5e4027 100644
--- a/tests/acceleration/Android.bp
+++ b/tests/acceleration/Android.bp
@@ -33,7 +33,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/accessibility/Android.bp b/tests/accessibility/Android.bp
index f4a0838..1512068 100644
--- a/tests/accessibility/Android.bp
+++ b/tests/accessibility/Android.bp
@@ -34,7 +34,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/accessibilityservice/Android.bp b/tests/accessibilityservice/Android.bp
index 5e10be3..0f7db14 100644
--- a/tests/accessibilityservice/Android.bp
+++ b/tests/accessibilityservice/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEmbeddedDisplayTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEmbeddedDisplayTest.java
index 0fd37c2..ece2fbf 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEmbeddedDisplayTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEmbeddedDisplayTest.java
@@ -19,6 +19,7 @@
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterWindowsChangeTypesAndWindowTitle;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.findWindowByTitle;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
+import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.supportsMultiDisplay;
import static android.accessibilityservice.cts.utils.AsyncUtils.DEFAULT_TIMEOUT_MS;
import static android.content.pm.PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
import static android.view.accessibility.AccessibilityEvent.WINDOWS_CHANGE_ADDED;
@@ -101,7 +102,7 @@
@Before
public void setUp() throws Exception {
mContext = sInstrumentation.getContext();
- assumeTrue(supportsMultiDisplay());
+ assumeTrue(supportsMultiDisplay(mContext));
mParentActivityTitle = mContext.getString(
R.string.accessibility_embedded_display_test_parent_activity);
@@ -246,11 +247,6 @@
assertNotNull(mEmbeddedDisplayActivity);
}
- private boolean supportsMultiDisplay() {
- return mContext.getPackageManager().hasSystemFeature(
- FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS);
- }
-
public static class EmbeddedDisplayParentActivity extends Activity {
private ActivityView mActivityView;
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTakeScreenshotTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTakeScreenshotTest.java
index c6b8ea9..6342713 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTakeScreenshotTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTakeScreenshotTest.java
@@ -18,6 +18,7 @@
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterWindowsChangedWithChangeTypes;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityOnSpecifiedDisplayAndWaitForItToBeOnscreen;
+import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.supportsMultiDisplay;
import static android.accessibilityservice.cts.utils.DisplayUtils.VirtualDisplaySession;
import static android.accessibilityservice.cts.utils.AsyncUtils.DEFAULT_TIMEOUT_MS;
import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
@@ -26,6 +27,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
@@ -158,6 +160,7 @@
@Test
public void testTakeScreenshotOnVirtualDisplay_GetScreenshotResult() throws Exception {
+ assumeTrue(supportsMultiDisplay(sInstrumentation.getContext()));
try (VirtualDisplaySession displaySession = new VirtualDisplaySession()) {
final int virtualDisplayId =
displaySession.createDisplayWithDefaultDisplayMetricsAndWait(mContext,
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index 252fbcb..454a833 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -21,6 +21,7 @@
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterWindowsChangedWithChangeTypes;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityOnSpecifiedDisplayAndWaitForItToBeOnscreen;
+import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.supportsMultiDisplay;
import static android.accessibilityservice.cts.utils.AsyncUtils.DEFAULT_TIMEOUT_MS;
import static android.accessibilityservice.cts.utils.DisplayUtils.getStatusBarHeight;
import static android.accessibilityservice.cts.utils.DisplayUtils.VirtualDisplaySession;
@@ -50,6 +51,7 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
import android.accessibilityservice.AccessibilityService;
@@ -637,6 +639,8 @@
@Test
public void testGetWindowsOnAllDisplays_resultIsSortedByLayerDescending() throws Exception {
+ assumeTrue(supportsMultiDisplay(sInstrumentation.getContext()));
+
addTwoAppPanelWindows(mActivity);
// Creates a virtual display.
try (final VirtualDisplaySession displaySession = new VirtualDisplaySession()) {
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
index 6d4347c..d73bac8 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
@@ -23,6 +23,7 @@
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.getActivityTitle;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityOnSpecifiedDisplayAndWaitForItToBeOnscreen;
+import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.supportsMultiDisplay;
import static android.accessibilityservice.cts.utils.DisplayUtils.VirtualDisplaySession;
import static android.accessibilityservice.cts.utils.DisplayUtils.getStatusBarHeight;
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
@@ -41,6 +42,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeTrue;
import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
import android.accessibilityservice.AccessibilityServiceInfo;
@@ -247,6 +249,8 @@
@Test
public void moveFocusToAnotherDisplay_movesActiveAndFocusWindow() throws Exception {
+ assumeTrue(supportsMultiDisplay(sInstrumentation.getContext()));
+
// Makes sure activityWindow on default display is focused
AccessibilityWindowInfo activityWindow = findWindowByTitle(sUiAutomation, mActivityTitle);
assertTrue(activityWindow.isActive());
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java
index 83ac347..6885b71 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java
@@ -16,6 +16,7 @@
import static android.accessibility.cts.common.ShellCommandBuilder.execShellCommand;
import static android.accessibilityservice.cts.utils.AsyncUtils.DEFAULT_TIMEOUT_MS;
+import static android.content.pm.PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -154,6 +155,11 @@
}
}
+ public static boolean supportsMultiDisplay(Context context) {
+ return context.getPackageManager().hasSystemFeature(
+ FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS);
+ }
+
private static boolean isHomeScreenShowing(Context context, UiAutomation uiAutomation) {
final List<AccessibilityWindowInfo> windows = uiAutomation.getWindows();
final PackageManager packageManager = context.getPackageManager();
diff --git a/tests/accessibilityservice/testsdk29/Android.bp b/tests/accessibilityservice/testsdk29/Android.bp
index 63a31ac..973bd71 100644
--- a/tests/accessibilityservice/testsdk29/Android.bp
+++ b/tests/accessibilityservice/testsdk29/Android.bp
@@ -28,7 +28,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/admin/Android.bp b/tests/admin/Android.bp
index c0e9bd7..a9bf3c3 100644
--- a/tests/admin/Android.bp
+++ b/tests/admin/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
instrumentation_for: "CtsAdminApp",
diff --git a/tests/admin/app/Android.bp b/tests/admin/app/Android.bp
index c507559..23f2cef 100644
--- a/tests/admin/app/Android.bp
+++ b/tests/admin/app/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/app/ActivityManagerApi29Test/Android.bp b/tests/app/ActivityManagerApi29Test/Android.bp
index 58c3233..b724d98 100644
--- a/tests/app/ActivityManagerApi29Test/Android.bp
+++ b/tests/app/ActivityManagerApi29Test/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/app/Android.bp b/tests/app/Android.bp
index 00d2d7a..6428109 100644
--- a/tests/app/Android.bp
+++ b/tests/app/Android.bp
@@ -37,7 +37,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
instrumentation_for: "CtsAppTestStubs",
@@ -71,7 +70,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -106,7 +104,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -136,7 +133,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "AppExitTest/AndroidManifest.xml",
diff --git a/tests/app/BadProviderStubs/Android.bp b/tests/app/BadProviderStubs/Android.bp
index 6b52583..4bb23ed 100644
--- a/tests/app/BadProviderStubs/Android.bp
+++ b/tests/app/BadProviderStubs/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/tests/app/CantSaveState1/Android.bp b/tests/app/CantSaveState1/Android.bp
index a87272f..d33f966 100644
--- a/tests/app/CantSaveState1/Android.bp
+++ b/tests/app/CantSaveState1/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/app/CantSaveState2/Android.bp b/tests/app/CantSaveState2/Android.bp
index 2877a0d..b3a26b8 100644
--- a/tests/app/CantSaveState2/Android.bp
+++ b/tests/app/CantSaveState2/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/app/NotificationDelegator/Android.bp b/tests/app/NotificationDelegator/Android.bp
index 8f13154..7398d69 100644
--- a/tests/app/NotificationDelegator/Android.bp
+++ b/tests/app/NotificationDelegator/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/app/StorageDelegator/Android.bp b/tests/app/StorageDelegator/Android.bp
index 90ea7b6..588988c 100644
--- a/tests/app/StorageDelegator/Android.bp
+++ b/tests/app/StorageDelegator/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/app/app/Android.bp b/tests/app/app/Android.bp
index ba27e9f..19e3fcc 100644
--- a/tests/app/app/Android.bp
+++ b/tests/app/app/Android.bp
@@ -37,7 +37,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
@@ -68,7 +67,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
@@ -102,7 +100,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
@@ -136,7 +133,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/tests/app/src/android/app/cts/DialogTest.java b/tests/app/src/android/app/cts/DialogTest.java
index dbc00e4..7f6631a 100755
--- a/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/app/src/android/app/cts/DialogTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
import static org.junit.Assert.fail;
import android.app.Dialog;
@@ -456,6 +457,9 @@
@Test
public void testTouchEvent() {
+ // Watch activities cover the entire screen, so there is no way to touch outside.
+ assumeFalse(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));
+
startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
@@ -486,11 +490,6 @@
assertTrue(d.isShowing());
touchMotionEvent.recycle();
- if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
- // Watch activities cover the entire screen, so there is no way to touch outside.
- return;
- }
-
// Send a touch event outside the dialog window. Expect the dialog to be dismissed
// because closeOnTouchOutside is true.
d.setCanceledOnTouchOutside(true);
diff --git a/tests/app/src/android/app/cts/InstrumentationTest.java b/tests/app/src/android/app/cts/InstrumentationTest.java
index d80d5fe..0d7b395 100644
--- a/tests/app/src/android/app/cts/InstrumentationTest.java
+++ b/tests/app/src/android/app/cts/InstrumentationTest.java
@@ -30,7 +30,7 @@
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
-import android.graphics.Point;
+import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
@@ -348,10 +348,9 @@
// We assume that the Activity is empty so there won't be anything in the middle
// to handle the touch. Consequently the Activity should receive onTouchEvent
// because nothing else handled it.
- Point size = new Point();
- mActivity.getWindowManager().getDefaultDisplay().getSize(size);
- final int x = size.x / 2;
- final int y = size.y / 2;
+ final Rect bounds = mActivity.getWindowManager().getCurrentWindowMetrics().getBounds();
+ final int x = bounds.centerX();
+ final int y = bounds.centerY();
long now = SystemClock.uptimeMillis();
MotionEvent orig = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN,
x, y, 0);
diff --git a/tests/apppredictionservice/Android.bp b/tests/apppredictionservice/Android.bp
index 64696ac..b09de20 100644
--- a/tests/apppredictionservice/Android.bp
+++ b/tests/apppredictionservice/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/aslr/Android.bp b/tests/aslr/Android.bp
index 63190f1..ca0049d 100644
--- a/tests/aslr/Android.bp
+++ b/tests/aslr/Android.bp
@@ -37,7 +37,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/autofillservice/Android.bp b/tests/autofillservice/Android.bp
index b7bda52..d04f23b 100644
--- a/tests/autofillservice/Android.bp
+++ b/tests/autofillservice/Android.bp
@@ -33,7 +33,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java
index e7f26e2..408ee46 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java
@@ -90,10 +90,9 @@
/**
* Put activity in TOP, will be followed by amStartActivity()
*/
- protected void splitWindow(Activity activity) throws Exception {
+ protected void splitWindow(Activity activity) {
mAtm.setTaskWindowingModeSplitScreenPrimary(activity.getTaskId(),
SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT, true, false, null, true);
- mUiBot.waitForWindowSplit();
}
protected void amStartActivity(Class<? extends Activity> activity2) {
diff --git a/tests/autofillservice/src/android/autofillservice/cts/UiBot.java b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
index 88173d3..1df7c93 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
@@ -1216,20 +1216,6 @@
}
/**
- * Waits until the window was split to show multiple activities.
- */
- public void waitForWindowSplit() throws Exception {
- try {
- assertShownById(SPLIT_WINDOW_DIVIDER_ID);
- } catch (Exception e) {
- final long timeout = Timeouts.ACTIVITY_RESURRECTION.ms();
- Log.e(TAG, "Did not find window divider " + SPLIT_WINDOW_DIVIDER_ID + "; waiting "
- + timeout + "ms instead");
- SystemClock.sleep(timeout);
- }
- }
-
- /**
* Finds the first {@link URLSpan} on the current screen.
*/
public URLSpan findFirstUrlSpanWithText(String str) throws Exception {
diff --git a/tests/backup/Android.bp b/tests/backup/Android.bp
index 218e962..b9bb624 100644
--- a/tests/backup/Android.bp
+++ b/tests/backup/Android.bp
@@ -33,7 +33,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/backup/app/Android.bp b/tests/backup/app/Android.bp
index ccbe771..0040c61 100644
--- a/tests/backup/app/Android.bp
+++ b/tests/backup/app/Android.bp
@@ -24,7 +24,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
@@ -44,7 +43,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
@@ -64,7 +62,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
@@ -84,7 +81,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk
index 1c2c67c..fd21184 100644
--- a/tests/camera/Android.mk
+++ b/tests/camera/Android.mk
@@ -95,7 +95,7 @@
$(call all-renderscript-files-under, src)
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_PACKAGE_NAME := CtsCameraTestCases
diff --git a/tests/camera/api25test/Android.mk b/tests/camera/api25test/Android.mk
index c6c9edf..0152f92 100644
--- a/tests/camera/api25test/Android.mk
+++ b/tests/camera/api25test/Android.mk
@@ -38,7 +38,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10
+LOCAL_COMPATIBILITY_SUITE := cts
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java b/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java
index 90a7dcd..d18da38 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java
@@ -2842,7 +2842,7 @@
if (mStaticInfo.isHardwareLevelAtLeastLimited()) {
mCollector.expectRectsAreSimilar(
"Request and result crop region should be similar",
- activeArraySize, cropRegion,
+ defaultCropRegion, cropRegion,
CROP_REGION_ERROR_PERCENT_DELTA * errorMultiplier);
}
diff --git a/tests/contentcaptureservice/Android.bp b/tests/contentcaptureservice/Android.bp
index 6b5d899..83f5cab 100644
--- a/tests/contentcaptureservice/Android.bp
+++ b/tests/contentcaptureservice/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/contentcaptureservice/OutsideOfPackageActivity/Android.bp b/tests/contentcaptureservice/OutsideOfPackageActivity/Android.bp
index afbf9af..02188bc 100644
--- a/tests/contentcaptureservice/OutsideOfPackageActivity/Android.bp
+++ b/tests/contentcaptureservice/OutsideOfPackageActivity/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/contentsuggestions/Android.bp b/tests/contentsuggestions/Android.bp
index 195e91d..cc285ea 100644
--- a/tests/contentsuggestions/Android.bp
+++ b/tests/contentsuggestions/Android.bp
@@ -28,7 +28,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/filesystem/Android.bp b/tests/filesystem/Android.bp
index aa7a15b..7294c91 100644
--- a/tests/filesystem/Android.bp
+++ b/tests/filesystem/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/fragment/Android.bp b/tests/fragment/Android.bp
index 2a5da46..ee2fdde 100644
--- a/tests/fragment/Android.bp
+++ b/tests/fragment/Android.bp
@@ -38,7 +38,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/fragment/sdk26/Android.bp b/tests/fragment/sdk26/Android.bp
index c6f2b58..69ac907 100644
--- a/tests/fragment/sdk26/Android.bp
+++ b/tests/fragment/sdk26/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/framework/base/windowmanager/Android.mk b/tests/framework/base/windowmanager/Android.mk
index ef6a95e..8a7f090 100644
--- a/tests/framework/base/windowmanager/Android.mk
+++ b/tests/framework/base/windowmanager/Android.mk
@@ -44,7 +44,7 @@
CtsMockInputMethodLib \
metrics-helper-lib \
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := test_current
diff --git a/tests/framework/base/windowmanager/alertwindowapp/Android.bp b/tests/framework/base/windowmanager/alertwindowapp/Android.bp
index 07069de..f264f40 100644
--- a/tests/framework/base/windowmanager/alertwindowapp/Android.bp
+++ b/tests/framework/base/windowmanager/alertwindowapp/Android.bp
@@ -27,7 +27,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp b/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp
index e7cbcdb..62fa41c 100644
--- a/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp
+++ b/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp
@@ -29,7 +29,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/alertwindowservice/Android.bp b/tests/framework/base/windowmanager/alertwindowservice/Android.bp
index 58d8688..82eeadb 100644
--- a/tests/framework/base/windowmanager/alertwindowservice/Android.bp
+++ b/tests/framework/base/windowmanager/alertwindowservice/Android.bp
@@ -25,7 +25,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/framework/base/windowmanager/app/Android.bp b/tests/framework/base/windowmanager/app/Android.bp
index b12f93b..0af9f75 100644
--- a/tests/framework/base/windowmanager/app/Android.bp
+++ b/tests/framework/base/windowmanager/app/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/app27/Android.bp b/tests/framework/base/windowmanager/app27/Android.bp
index 6ddf919..a9cacef 100644
--- a/tests/framework/base/windowmanager/app27/Android.bp
+++ b/tests/framework/base/windowmanager/app27/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appAShareUid/Android.bp b/tests/framework/base/windowmanager/appAShareUid/Android.bp
index 57adfd6..96e644d 100644
--- a/tests/framework/base/windowmanager/appAShareUid/Android.bp
+++ b/tests/framework/base/windowmanager/appAShareUid/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appBShareUid/Android.bp b/tests/framework/base/windowmanager/appBShareUid/Android.bp
index ec15e80..01513e3 100644
--- a/tests/framework/base/windowmanager/appBShareUid/Android.bp
+++ b/tests/framework/base/windowmanager/appBShareUid/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp b/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp
index c83b44f..756bbc9 100644
--- a/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp
+++ b/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appDisplaySize/Android.bp b/tests/framework/base/windowmanager/appDisplaySize/Android.bp
index 819a9bf..b4e6a4a 100644
--- a/tests/framework/base/windowmanager/appDisplaySize/Android.bp
+++ b/tests/framework/base/windowmanager/appDisplaySize/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp b/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp
index d110d19..eab5460 100644
--- a/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp
+++ b/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appProfileable/Android.bp b/tests/framework/base/windowmanager/appProfileable/Android.bp
index cd54094..177062a 100644
--- a/tests/framework/base/windowmanager/appProfileable/Android.bp
+++ b/tests/framework/base/windowmanager/appProfileable/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appSecondUid/Android.bp b/tests/framework/base/windowmanager/appSecondUid/Android.bp
index 5f44f5c..9d2aab6 100644
--- a/tests/framework/base/windowmanager/appSecondUid/Android.bp
+++ b/tests/framework/base/windowmanager/appSecondUid/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/appThirdUid/Android.bp b/tests/framework/base/windowmanager/appThirdUid/Android.bp
index 08a878c..c333a56 100644
--- a/tests/framework/base/windowmanager/appThirdUid/Android.bp
+++ b/tests/framework/base/windowmanager/appThirdUid/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/backgroundactivity/Android.bp b/tests/framework/base/windowmanager/backgroundactivity/Android.bp
index ca4b0ed..8b4e970 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/Android.bp
+++ b/tests/framework/base/windowmanager/backgroundactivity/Android.bp
@@ -32,7 +32,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppA/Android.bp b/tests/framework/base/windowmanager/backgroundactivity/AppA/Android.bp
index a5153de..47e56e5 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/AppA/Android.bp
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppA/Android.bp
@@ -27,7 +27,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppB/Android.bp b/tests/framework/base/windowmanager/backgroundactivity/AppB/Android.bp
index 7c10622..b2482b3 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/AppB/Android.bp
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppB/Android.bp
@@ -27,7 +27,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/framework/base/windowmanager/dndsourceapp/Android.bp b/tests/framework/base/windowmanager/dndsourceapp/Android.bp
index 7abd478..4f7734d 100644
--- a/tests/framework/base/windowmanager/dndsourceapp/Android.bp
+++ b/tests/framework/base/windowmanager/dndsourceapp/Android.bp
@@ -24,7 +24,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/dndtargetapp/Android.bp b/tests/framework/base/windowmanager/dndtargetapp/Android.bp
index 00b4055..bf7372b 100644
--- a/tests/framework/base/windowmanager/dndtargetapp/Android.bp
+++ b/tests/framework/base/windowmanager/dndtargetapp/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp b/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp
index 13dbca2..b658c2a 100644
--- a/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp
+++ b/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/framework/base/windowmanager/jetpack/Android.bp b/tests/framework/base/windowmanager/jetpack/Android.bp
index 7d03ff4..ec0c189 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"],
@@ -61,7 +76,6 @@
test_suites: [
"cts",
"vts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
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;
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java
index da7a534..70c299d 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java
@@ -18,7 +18,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.graphics.Insets.NONE;
-import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.WindowInsets.Type.ime;
import static android.view.WindowInsets.Type.navigationBars;
import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
@@ -72,8 +71,7 @@
private void initActivity(boolean useFloating) throws Exception {
initMockImeSession(useFloating);
- mActivity = startActivity(TestActivity.class, DEFAULT_DISPLAY, true,
- WINDOWING_MODE_FULLSCREEN);
+ mActivity = startActivityInWindowingMode(TestActivity.class, WINDOWING_MODE_FULLSCREEN);
mRootView = mActivity.getWindow().getDecorView();
}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsLayoutTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsLayoutTests.java
index 91e1748..209d2ed 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsLayoutTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsLayoutTests.java
@@ -16,6 +16,7 @@
package android.server.wm;
+import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
@@ -39,7 +40,6 @@
import com.android.compatibility.common.util.PollingCheck;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -57,7 +57,9 @@
@Test
public void testSetFitInsetsTypes() {
- final TestActivity activity = startActivity(TestActivity.class);
+ // Start the Activity in fullscreen windowing mode for its bounds to match display bounds.
+ final TestActivity activity =
+ startActivityInWindowingMode(TestActivity.class, WINDOWING_MODE_FULLSCREEN);
// Make sure the main window has been laid out.
final View mainWindowRoot = activity.getWindow().getDecorView();
@@ -99,7 +101,9 @@
@Test
public void testSetFitInsetsSides() {
- final TestActivity activity = startActivity(TestActivity.class);
+ // Start the Activity in fullscreen windowing mode for its bounds to match display bounds.
+ final TestActivity activity =
+ startActivityInWindowingMode(TestActivity.class, WINDOWING_MODE_FULLSCREEN);
// Make sure the main window has been laid out.
final View mainWindowRoot = activity.getWindow().getDecorView();
@@ -143,7 +147,9 @@
@Test
public void testSetFitInsetsIgnoringVisibility() {
- final TestActivity activity = startActivity(TestActivity.class);
+ // Start the Activity in fullscreen windowing mode for its bounds to match display bounds.
+ final TestActivity activity =
+ startActivityInWindowingMode(TestActivity.class, WINDOWING_MODE_FULLSCREEN);
// Make sure the main window has been laid out.
final View mainWindowRoot = activity.getWindow().getDecorView();
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowManagerTestBase.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowManagerTestBase.java
index 10e4423..0cf96d8 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowManagerTestBase.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowManagerTestBase.java
@@ -37,8 +37,6 @@
import org.junit.Before;
import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
import javax.annotation.concurrent.GuardedBy;
@@ -56,11 +54,20 @@
return startActivity(cls, DEFAULT_DISPLAY);
}
- static <T extends FocusableActivity> T startActivity(Class<T> cls, int displayId,
- boolean hasFocus) {
+ static <T extends FocusableActivity> T startActivity(Class<T> cls, int displayId) {
+ return startActivity(cls, displayId, true /* hasFocus */);
+ }
+
+ static <T extends FocusableActivity> T startActivity(
+ Class<T> cls, int displayId, boolean hasFocus) {
return startActivity(cls, displayId, hasFocus, WINDOWING_MODE_UNDEFINED);
}
+ static <T extends FocusableActivity> T startActivityInWindowingMode(
+ Class<T> cls, int windowingMode) {
+ return startActivity(cls, DEFAULT_DISPLAY, true /* hasFocus */, windowingMode);
+ }
+
static <T extends FocusableActivity> T startActivity(Class<T> cls, int displayId,
boolean hasFocus, int windowingMode) {
final Bundle options;
@@ -82,10 +89,6 @@
return activity[0];
}
- static <T extends FocusableActivity> T startActivity(Class<T> cls, int displayId) {
- return startActivity(cls, displayId, true /* hasFocus */);
- }
-
static class FocusableActivity extends Activity {
private final Object mLockWindowFocus = new Object();
diff --git a/tests/framework/base/windowmanager/testsdk25/Android.bp b/tests/framework/base/windowmanager/testsdk25/Android.bp
index 12bca0c..cc90392 100644
--- a/tests/framework/base/windowmanager/testsdk25/Android.bp
+++ b/tests/framework/base/windowmanager/testsdk25/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/testsdk28/Android.bp b/tests/framework/base/windowmanager/testsdk28/Android.bp
index 6962ffa..67d3516 100644
--- a/tests/framework/base/windowmanager/testsdk28/Android.bp
+++ b/tests/framework/base/windowmanager/testsdk28/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/testsdk29/Android.bp b/tests/framework/base/windowmanager/testsdk29/Android.bp
index ca76c86..f19f7b7 100644
--- a/tests/framework/base/windowmanager/testsdk29/Android.bp
+++ b/tests/framework/base/windowmanager/testsdk29/Android.bp
@@ -33,7 +33,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/translucentapp/Android.bp b/tests/framework/base/windowmanager/translucentapp/Android.bp
index c551c29..9665321 100644
--- a/tests/framework/base/windowmanager/translucentapp/Android.bp
+++ b/tests/framework/base/windowmanager/translucentapp/Android.bp
@@ -29,7 +29,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/framework/base/windowmanager/translucentappsdk26/Android.bp b/tests/framework/base/windowmanager/translucentappsdk26/Android.bp
index 7c8d0d8..2b5ff50 100644
--- a/tests/framework/base/windowmanager/translucentappsdk26/Android.bp
+++ b/tests/framework/base/windowmanager/translucentappsdk26/Android.bp
@@ -27,7 +27,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/inputmethod/Android.bp b/tests/inputmethod/Android.bp
index 95d5fa1..9b92f34 100644
--- a/tests/inputmethod/Android.bp
+++ b/tests/inputmethod/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
compile_multilib: "both",
diff --git a/tests/inputmethod/mockime/Android.bp b/tests/inputmethod/mockime/Android.bp
index c73f870..58849e4 100644
--- a/tests/inputmethod/mockime/Android.bp
+++ b/tests/inputmethod/mockime/Android.bp
@@ -40,7 +40,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/jdwp/Android.bp b/tests/jdwp/Android.bp
index ef127b5..bea346d 100644
--- a/tests/jdwp/Android.bp
+++ b/tests/jdwp/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/jdwp/runner/host-side/Android.bp b/tests/jdwp/runner/host-side/Android.bp
index db1e3fa..a78fe2e 100644
--- a/tests/jdwp/runner/host-side/Android.bp
+++ b/tests/jdwp/runner/host-side/Android.bp
@@ -33,7 +33,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/leanbackjank/Android.bp b/tests/leanbackjank/Android.bp
index ccd0354..f72d1fb 100644
--- a/tests/leanbackjank/Android.bp
+++ b/tests/leanbackjank/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/leanbackjank/app/Android.bp b/tests/leanbackjank/app/Android.bp
index 7f1f8cf..cfcff77 100644
--- a/tests/leanbackjank/app/Android.bp
+++ b/tests/leanbackjank/app/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
resource_dirs: ["res"],
diff --git a/tests/libcore/jsr166/Android.bp b/tests/libcore/jsr166/Android.bp
index 57fde13..b6dbd78 100644
--- a/tests/libcore/jsr166/Android.bp
+++ b/tests/libcore/jsr166/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/libcore/luni/Android.bp b/tests/libcore/luni/Android.bp
index 902b1be..5edde79 100644
--- a/tests/libcore/luni/Android.bp
+++ b/tests/libcore/luni/Android.bp
@@ -58,7 +58,6 @@
test_suites: [
"cts",
"mts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/libcore/ojluni/Android.bp b/tests/libcore/ojluni/Android.bp
index 54bc421..6a5e8ed 100644
--- a/tests/libcore/ojluni/Android.bp
+++ b/tests/libcore/ojluni/Android.bp
@@ -36,7 +36,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/libcore/okhttp/Android.bp b/tests/libcore/okhttp/Android.bp
index 4d38e82..02ce4e4 100644
--- a/tests/libcore/okhttp/Android.bp
+++ b/tests/libcore/okhttp/Android.bp
@@ -41,6 +41,5 @@
"cts",
"general-tests",
"mts",
- "vts10",
],
}
diff --git a/tests/libcore/runner/Android.bp b/tests/libcore/runner/Android.bp
index 563ea1e..25a9dcd 100644
--- a/tests/libcore/runner/Android.bp
+++ b/tests/libcore/runner/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/libcore/wycheproof-bc/Android.bp b/tests/libcore/wycheproof-bc/Android.bp
index a967745..a922531 100644
--- a/tests/libcore/wycheproof-bc/Android.bp
+++ b/tests/libcore/wycheproof-bc/Android.bp
@@ -37,6 +37,5 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
}
diff --git a/tests/libcore/wycheproof/Android.bp b/tests/libcore/wycheproof/Android.bp
index bc7dbb1..859e82f 100644
--- a/tests/libcore/wycheproof/Android.bp
+++ b/tests/libcore/wycheproof/Android.bp
@@ -37,7 +37,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/location/location_coarse/Android.bp b/tests/location/location_coarse/Android.bp
index d029fdf..ba53aea 100644
--- a/tests/location/location_coarse/Android.bp
+++ b/tests/location/location_coarse/Android.bp
@@ -30,7 +30,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/location/location_fine/Android.bp b/tests/location/location_fine/Android.bp
index fa6a952..acd0b1d 100644
--- a/tests/location/location_fine/Android.bp
+++ b/tests/location/location_fine/Android.bp
@@ -30,7 +30,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/location/location_gnss/Android.bp b/tests/location/location_gnss/Android.bp
index bc16703..5748862 100644
--- a/tests/location/location_gnss/Android.bp
+++ b/tests/location/location_gnss/Android.bp
@@ -60,7 +60,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/location/location_none/Android.bp b/tests/location/location_none/Android.bp
index 359a635..74732aa 100644
--- a/tests/location/location_none/Android.bp
+++ b/tests/location/location_none/Android.bp
@@ -30,7 +30,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/media/Android.bp b/tests/media/Android.bp
index 68f0e40..985fb79 100644
--- a/tests/media/Android.bp
+++ b/tests/media/Android.bp
@@ -36,7 +36,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "29",
diff --git a/tests/media/AndroidTest.xml b/tests/media/AndroidTest.xml
index ce8a218..b031871 100644
--- a/tests/media/AndroidTest.xml
+++ b/tests/media/AndroidTest.xml
@@ -25,7 +25,7 @@
</target_preparer>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer">
<option name="push-all" value="true" />
- <option name="media-folder-name" value="CtsMediaV2TestCases-1.7" />
+ <option name="media-folder-name" value="CtsMediaV2TestCases-1.8" />
<option name="dynamic-config-module" value="CtsMediaV2TestCases" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/tests/media/DynamicConfig.xml b/tests/media/DynamicConfig.xml
index 33ebea5..0576076 100644
--- a/tests/media/DynamicConfig.xml
+++ b/tests/media/DynamicConfig.xml
@@ -1,6 +1,6 @@
<dynamicConfig>
<entry key="media_files_url">
- <value>https://storage.googleapis.com/android_media/cts/tests/media/CtsMediaV2TestCases-1.7.zip</value>
+ <value>https://storage.googleapis.com/android_media/cts/tests/media/CtsMediaV2TestCases-1.8.zip</value>
</entry>
</dynamicConfig>
diff --git a/tests/media/copy_media.sh b/tests/media/copy_media.sh
index 1da6221..0a57d6c 100755
--- a/tests/media/copy_media.sh
+++ b/tests/media/copy_media.sh
@@ -17,7 +17,7 @@
## script to install mediav2 test files manually
adbOptions=" "
-resLabel=CtsMediaV2TestCases-1.7
+resLabel=CtsMediaV2TestCases-1.8
srcDir="/tmp/$resLabel"
tgtDir="/sdcard/test"
usage="Usage: $0 [-h] [-s serial]"
diff --git a/tests/media/jni/NativeCodecEncoderTest.cpp b/tests/media/jni/NativeCodecEncoderTest.cpp
index 032bd6c..6748c31 100644
--- a/tests/media/jni/NativeCodecEncoderTest.cpp
+++ b/tests/media/jni/NativeCodecEncoderTest.cpp
@@ -162,7 +162,12 @@
int channels = mEncParamList2[i];
AMediaFormat* format = AMediaFormat_new();
AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, mMime);
- AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_BIT_RATE, bitrate);
+ if (!strcmp(mMime, AMEDIA_MIMETYPE_AUDIO_FLAC)) {
+ AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL,
+ bitrate);
+ } else {
+ AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_BIT_RATE, bitrate);
+ }
AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_SAMPLE_RATE, rate);
AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_CHANNEL_COUNT, channels);
mFormats.push_back(format);
diff --git a/tests/media/jni/NativeMediaCommon.cpp b/tests/media/jni/NativeMediaCommon.cpp
index cd8f68c..8cccbc0 100644
--- a/tests/media/jni/NativeMediaCommon.cpp
+++ b/tests/media/jni/NativeMediaCommon.cpp
@@ -36,6 +36,7 @@
const char* AMEDIA_MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
const char* AMEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
const char* AMEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";
+const char* AMEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac";
const char* AMEDIA_MIMETYPE_AUDIO_VORBIS = "audio/vorbis";
const char* AMEDIA_MIMETYPE_AUDIO_OPUS = "audio/opus";
diff --git a/tests/media/jni/NativeMediaCommon.h b/tests/media/jni/NativeMediaCommon.h
index 6ad7c72..ec5721c 100644
--- a/tests/media/jni/NativeMediaCommon.h
+++ b/tests/media/jni/NativeMediaCommon.h
@@ -30,6 +30,7 @@
extern const char* AMEDIA_MIMETYPE_AUDIO_AMR_NB;
extern const char* AMEDIA_MIMETYPE_AUDIO_AMR_WB;
extern const char* AMEDIA_MIMETYPE_AUDIO_AAC;
+extern const char* AMEDIA_MIMETYPE_AUDIO_FLAC;
extern const char* AMEDIA_MIMETYPE_AUDIO_VORBIS;
extern const char* AMEDIA_MIMETYPE_AUDIO_OPUS;
diff --git a/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java b/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java
index 3c70eac..75656e9 100644
--- a/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java
+++ b/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java
@@ -126,6 +126,9 @@
"bbb_520x390_1mbps_30fps_split_non_display_frame_vp9.webm"},
{MediaFormat.MIMETYPE_VIDEO_AV1, "bbb_340x280_768kbps_30fps_av1.mp4",
"bbb_520x390_1mbps_30fps_av1.mp4"},
+ {MediaFormat.MIMETYPE_VIDEO_AV1,
+ "bikes_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_av1.mp4",
+ "bbb_520x390_1mbps_30fps_av1.mp4"},
});
return prepareParamList(exhaustiveArgsList, isEncoder, needAudio, needVideo, true);
}
diff --git a/tests/media/src/android/mediav2/cts/CodecEncoderTest.java b/tests/media/src/android/mediav2/cts/CodecEncoderTest.java
index 3f977b8..0d5f49c 100644
--- a/tests/media/src/android/mediav2/cts/CodecEncoderTest.java
+++ b/tests/media/src/android/mediav2/cts/CodecEncoderTest.java
@@ -179,8 +179,9 @@
10200, 12200}, new int[]{8000}, new int[]{1}},
{MediaFormat.MIMETYPE_AUDIO_AMR_WB, new int[]{6600, 8850, 12650, 14250, 15850,
18250, 19850, 23050, 23850}, new int[]{16000}, new int[]{1}},
- {MediaFormat.MIMETYPE_AUDIO_FLAC, new int[]{64000, 192000}, new int[]{8000, 48000
- , 96000, 192000}, new int[]{1, 2}},
+ /* TODO(169310292) */
+ {MediaFormat.MIMETYPE_AUDIO_FLAC, new int[]{/* 0, 1, 2, */ 3, 4, 5, 6, 7, 8},
+ new int[]{8000, 48000, 96000, 192000}, new int[]{1, 2}},
// Video - CodecMime, arrays of bit-rates, height, width
{MediaFormat.MIMETYPE_VIDEO_H263, new int[]{32000, 64000}, new int[]{176},
@@ -227,7 +228,11 @@
for (int channels : mEncParamList2) {
MediaFormat format = new MediaFormat();
format.setString(MediaFormat.KEY_MIME, mMime);
- format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+ if (mMime.equals(MediaFormat.MIMETYPE_AUDIO_FLAC)) {
+ format.setInteger(MediaFormat.KEY_FLAC_COMPRESSION_LEVEL, bitrate);
+ } else {
+ format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+ }
format.setInteger(MediaFormat.KEY_SAMPLE_RATE, rate);
format.setInteger(MediaFormat.KEY_CHANNEL_COUNT, channels);
mFormats.add(format);
diff --git a/tests/media/src/android/mediav2/cts/DecoderColorAspectsTest.java b/tests/media/src/android/mediav2/cts/DecoderColorAspectsTest.java
index accc7be..d848059 100644
--- a/tests/media/src/android/mediav2/cts/DecoderColorAspectsTest.java
+++ b/tests/media/src/android/mediav2/cts/DecoderColorAspectsTest.java
@@ -85,11 +85,11 @@
MediaFormat.COLOR_RANGE_FULL, /* MediaFormat.COLOR_STANDARD_BT470M */ 8,
MediaFormat.COLOR_TRANSFER_LINEAR, true},
{MediaFormat.MIMETYPE_VIDEO_AVC,
- "bbb_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_avc.mp4",
+ "bikes_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_avc.mp4",
MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_ST2084, true},
{MediaFormat.MIMETYPE_VIDEO_AVC,
- "bbb_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_avc.mp4",
+ "bikes_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_avc.mp4",
MediaFormat.COLOR_RANGE_FULL, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_HLG, true},
@@ -112,11 +112,11 @@
MediaFormat.COLOR_RANGE_FULL, /* MediaFormat.COLOR_STANDARD_BT470M */ 8,
MediaFormat.COLOR_TRANSFER_LINEAR, true},
{MediaFormat.MIMETYPE_VIDEO_HEVC,
- "bbb_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_hevc.mp4",
+ "bikes_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_hevc.mp4",
MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_ST2084, true},
{MediaFormat.MIMETYPE_VIDEO_HEVC,
- "bbb_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_hevc.mp4",
+ "bikes_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_hevc.mp4",
MediaFormat.COLOR_RANGE_FULL, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_HLG, true},
@@ -138,14 +138,6 @@
{MediaFormat.MIMETYPE_VIDEO_MPEG2, "bbb_qcif_color_bt470m_linear_lr_mpeg2.mp4",
MediaFormat.COLOR_RANGE_LIMITED, /* MediaFormat.COLOR_STANDARD_BT470M */ 8,
MediaFormat.COLOR_TRANSFER_LINEAR, true},
- {MediaFormat.MIMETYPE_VIDEO_MPEG2,
- "bbb_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_mpeg2.mp4",
- MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
- MediaFormat.COLOR_TRANSFER_ST2084, true},
- {MediaFormat.MIMETYPE_VIDEO_MPEG2,
- "bbb_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_lr_mpeg2.mp4",
- MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
- MediaFormat.COLOR_TRANSFER_HLG, true},
// Mpeg4 clips
{MediaFormat.MIMETYPE_VIDEO_MPEG4, "bbb_qcif_color_bt709_lr_sdr_mpeg4.mp4",
@@ -165,14 +157,6 @@
{MediaFormat.MIMETYPE_VIDEO_MPEG4, "bbb_qcif_color_bt470m_linear_fr_mpeg4.mp4",
MediaFormat.COLOR_RANGE_FULL, /* MediaFormat.COLOR_STANDARD_BT470M */ 8,
MediaFormat.COLOR_TRANSFER_LINEAR, false},
- {MediaFormat.MIMETYPE_VIDEO_MPEG4,
- "bbb_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_mpeg4.mp4",
- MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
- MediaFormat.COLOR_TRANSFER_ST2084, false},
- {MediaFormat.MIMETYPE_VIDEO_MPEG4,
- "bbb_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_mpeg4.mp4",
- MediaFormat.COLOR_RANGE_FULL, MediaFormat.COLOR_STANDARD_BT2020,
- MediaFormat.COLOR_TRANSFER_HLG, false},
// Vp8 clips
{MediaFormat.MIMETYPE_VIDEO_VP8, "bbb_qcif_color_bt709_lr_sdr_vp8.webm",
@@ -192,14 +176,6 @@
{MediaFormat.MIMETYPE_VIDEO_VP8, "bbb_qcif_color_bt470m_linear_fr_vp8.mkv",
MediaFormat.COLOR_RANGE_FULL, /* MediaFormat.COLOR_STANDARD_BT470M */ 8,
MediaFormat.COLOR_TRANSFER_LINEAR, false},
- {MediaFormat.MIMETYPE_VIDEO_VP8,
- "bbb_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_vp8.mkv",
- MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
- MediaFormat.COLOR_TRANSFER_ST2084, false},
- {MediaFormat.MIMETYPE_VIDEO_VP8,
- "bbb_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_vp8.mkv",
- MediaFormat.COLOR_RANGE_FULL, MediaFormat.COLOR_STANDARD_BT2020,
- MediaFormat.COLOR_TRANSFER_HLG, false},
// Vp9 clips
{MediaFormat.MIMETYPE_VIDEO_VP9, "bbb_qcif_color_bt709_lr_sdr_vp9.webm",
@@ -220,11 +196,11 @@
MediaFormat.COLOR_RANGE_FULL, /* MediaFormat.COLOR_STANDARD_BT470M */ 8,
MediaFormat.COLOR_TRANSFER_LINEAR, false},
{MediaFormat.MIMETYPE_VIDEO_VP9,
- "bbb_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_vp9.mkv",
+ "bikes_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_vp9.mkv",
MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_ST2084, false},
{MediaFormat.MIMETYPE_VIDEO_VP9,
- "bbb_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_vp9.mkv",
+ "bikes_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_vp9.mkv",
MediaFormat.COLOR_RANGE_FULL, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_HLG, false},
@@ -247,11 +223,11 @@
MediaFormat.COLOR_RANGE_FULL, /* MediaFormat.COLOR_STANDARD_BT470M */ 8,
MediaFormat.COLOR_TRANSFER_LINEAR, true},
{MediaFormat.MIMETYPE_VIDEO_AV1,
- "bbb_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_av1.mp4",
+ "bikes_qcif_color_bt2020_smpte2084_bt2020Ncl_lr_av1.mp4",
MediaFormat.COLOR_RANGE_LIMITED, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_ST2084, true},
{MediaFormat.MIMETYPE_VIDEO_AV1,
- "bbb_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_av1.mp4",
+ "bikes_qcif_color_bt2020_smpte2086Hlg_bt2020Ncl_fr_av1.mp4",
MediaFormat.COLOR_RANGE_FULL, MediaFormat.COLOR_STANDARD_BT2020,
MediaFormat.COLOR_TRANSFER_HLG, true},
});
diff --git a/tests/media/src/android/mediav2/cts/WorkDir.java b/tests/media/src/android/mediav2/cts/WorkDir.java
index 0177df2..747845e 100644
--- a/tests/media/src/android/mediav2/cts/WorkDir.java
+++ b/tests/media/src/android/mediav2/cts/WorkDir.java
@@ -40,7 +40,7 @@
// user has specified the mediaDirString via instrumentation-arg
return mediaDirString + ((mediaDirString.endsWith("/")) ? "" : "/");
} else {
- return (getTopDirString() + "test/CtsMediaV2TestCases-1.7/");
+ return (getTopDirString() + "test/CtsMediaV2TestCases-1.8/");
}
}
}
\ No newline at end of file
diff --git a/tests/mocking/Android.bp b/tests/mocking/Android.bp
index 0078df2..2c000b3 100644
--- a/tests/mocking/Android.bp
+++ b/tests/mocking/Android.bp
@@ -24,7 +24,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/mocking/debuggable/Android.bp b/tests/mocking/debuggable/Android.bp
index 93a8177..aa8cda7 100644
--- a/tests/mocking/debuggable/Android.bp
+++ b/tests/mocking/debuggable/Android.bp
@@ -24,7 +24,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/mocking/extended/Android.bp b/tests/mocking/extended/Android.bp
index 4b06d94..da3a33c 100644
--- a/tests/mocking/extended/Android.bp
+++ b/tests/mocking/extended/Android.bp
@@ -36,7 +36,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/mocking/inline/Android.bp b/tests/mocking/inline/Android.bp
index be66484..6a57df4 100644
--- a/tests/mocking/inline/Android.bp
+++ b/tests/mocking/inline/Android.bp
@@ -31,7 +31,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/netlegacy22.api/Android.mk b/tests/netlegacy22.api/Android.mk
index 852803f..53c910d 100644
--- a/tests/netlegacy22.api/Android.mk
+++ b/tests/netlegacy22.api/Android.mk
@@ -30,6 +30,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt compatibility-device-util-axt
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/netlegacy22.permission/Android.bp b/tests/netlegacy22.permission/Android.bp
index 778ada2..65948a6 100644
--- a/tests/netlegacy22.permission/Android.bp
+++ b/tests/netlegacy22.permission/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/netsecpolicy/Android.bp b/tests/netsecpolicy/Android.bp
index 42b3675..b54debb 100644
--- a/tests/netsecpolicy/Android.bp
+++ b/tests/netsecpolicy/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
@@ -32,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
@@ -46,7 +44,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/openglperf2/Android.mk b/tests/openglperf2/Android.mk
index 98e5d01..a6de6c8 100644
--- a/tests/openglperf2/Android.mk
+++ b/tests/openglperf2/Android.mk
@@ -30,7 +30,7 @@
LOCAL_PACKAGE_NAME := CtsOpenGlPerf2TestCases
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := 16
#LOCAL_MIN_SDK_VERSION := 16
diff --git a/tests/pdf/Android.bp b/tests/pdf/Android.bp
index 233311c..66f91d5 100644
--- a/tests/pdf/Android.bp
+++ b/tests/pdf/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/providerui/Android.bp b/tests/providerui/Android.bp
index 03e2cc6..fbb2e0e 100644
--- a/tests/providerui/Android.bp
+++ b/tests/providerui/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/sample/Android.bp b/tests/sample/Android.bp
index dec1303..d2c02da 100644
--- a/tests/sample/Android.bp
+++ b/tests/sample/Android.bp
@@ -33,7 +33,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/sensor/Android.mk b/tests/sensor/Android.mk
index 656cff8..d198b04 100644
--- a/tests/sensor/Android.mk
+++ b/tests/sensor/Android.mk
@@ -73,7 +73,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
# include both the 32 and 64 bit versions
LOCAL_MULTILIB := both
diff --git a/tests/signature/api-check/android-test-base-28-api/Android.bp b/tests/signature/api-check/android-test-base-28-api/Android.bp
index 31263b4..8717b17 100644
--- a/tests/signature/api-check/android-test-base-28-api/Android.bp
+++ b/tests/signature/api-check/android-test-base-28-api/Android.bp
@@ -25,7 +25,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/android-test-base-current-api/Android.bp b/tests/signature/api-check/android-test-base-current-api/Android.bp
index 8ef01a1..52ed46b 100644
--- a/tests/signature/api-check/android-test-base-current-api/Android.bp
+++ b/tests/signature/api-check/android-test-base-current-api/Android.bp
@@ -24,7 +24,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/android-test-mock-current-api/Android.bp b/tests/signature/api-check/android-test-mock-current-api/Android.bp
index 44c7a8a..d017870 100644
--- a/tests/signature/api-check/android-test-mock-current-api/Android.bp
+++ b/tests/signature/api-check/android-test-mock-current-api/Android.bp
@@ -24,7 +24,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/android-test-runner-current-api/Android.bp b/tests/signature/api-check/android-test-runner-current-api/Android.bp
index 80d2803..d8fdad2 100644
--- a/tests/signature/api-check/android-test-runner-current-api/Android.bp
+++ b/tests/signature/api-check/android-test-runner-current-api/Android.bp
@@ -26,7 +26,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/apache-http-legacy-27-api/Android.bp b/tests/signature/api-check/apache-http-legacy-27-api/Android.bp
index d649145..aca1897 100644
--- a/tests/signature/api-check/apache-http-legacy-27-api/Android.bp
+++ b/tests/signature/api-check/apache-http-legacy-27-api/Android.bp
@@ -26,7 +26,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/apache-http-legacy-current-api/Android.bp b/tests/signature/api-check/apache-http-legacy-current-api/Android.bp
index ffda5cc..9ae437a 100644
--- a/tests/signature/api-check/apache-http-legacy-current-api/Android.bp
+++ b/tests/signature/api-check/apache-http-legacy-current-api/Android.bp
@@ -24,7 +24,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/apache-http-legacy-uses-library-api/Android.bp b/tests/signature/api-check/apache-http-legacy-uses-library-api/Android.bp
index f811f85..2b414c3 100644
--- a/tests/signature/api-check/apache-http-legacy-uses-library-api/Android.bp
+++ b/tests/signature/api-check/apache-http-legacy-uses-library-api/Android.bp
@@ -25,7 +25,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/build_signature_apk.mk b/tests/signature/api-check/build_signature_apk.mk
index ab6169e..ae8e2b5 100644
--- a/tests/signature/api-check/build_signature_apk.mk
+++ b/tests/signature/api-check/build_signature_apk.mk
@@ -24,7 +24,7 @@
LOCAL_MODULE_TAGS := tests
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := current
diff --git a/tests/signature/api-check/current-api/Android.bp b/tests/signature/api-check/current-api/Android.bp
index 61656c3..04eced6 100644
--- a/tests/signature/api-check/current-api/Android.bp
+++ b/tests/signature/api-check/current-api/Android.bp
@@ -27,7 +27,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-blocklist-27-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-27-api/Android.bp
index fb706fc..bf603a7 100644
--- a/tests/signature/api-check/hidden-api-blocklist-27-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-27-api/Android.bp
@@ -22,7 +22,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-blocklist-28-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-28-api/Android.bp
index da459b1..8aa4d36 100644
--- a/tests/signature/api-check/hidden-api-blocklist-28-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-28-api/Android.bp
@@ -22,7 +22,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-blocklist-current-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-current-api/Android.bp
index 8c559f0..a0031cb 100644
--- a/tests/signature/api-check/hidden-api-blocklist-current-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-current-api/Android.bp
@@ -21,7 +21,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-blocklist-debug-class/Android.bp b/tests/signature/api-check/hidden-api-blocklist-debug-class/Android.bp
index 09513a5..c21810a 100644
--- a/tests/signature/api-check/hidden-api-blocklist-debug-class/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-debug-class/Android.bp
@@ -21,7 +21,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-blocklist-test-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-test-api/Android.bp
index f624978..89621ca 100644
--- a/tests/signature/api-check/hidden-api-blocklist-test-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-test-api/Android.bp
@@ -20,7 +20,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-killswitch-debug-class/Android.bp b/tests/signature/api-check/hidden-api-killswitch-debug-class/Android.bp
index 08ead17..5e88438 100644
--- a/tests/signature/api-check/hidden-api-killswitch-debug-class/Android.bp
+++ b/tests/signature/api-check/hidden-api-killswitch-debug-class/Android.bp
@@ -19,7 +19,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-killswitch-sdklist/Android.bp b/tests/signature/api-check/hidden-api-killswitch-sdklist/Android.bp
index fa20649..b5c594b 100644
--- a/tests/signature/api-check/hidden-api-killswitch-sdklist/Android.bp
+++ b/tests/signature/api-check/hidden-api-killswitch-sdklist/Android.bp
@@ -19,7 +19,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/hidden-api-killswitch-wildcard/Android.bp b/tests/signature/api-check/hidden-api-killswitch-wildcard/Android.bp
index 221006c..599a8a1 100644
--- a/tests/signature/api-check/hidden-api-killswitch-wildcard/Android.bp
+++ b/tests/signature/api-check/hidden-api-killswitch-wildcard/Android.bp
@@ -19,7 +19,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/system-annotation/Android.bp b/tests/signature/api-check/system-annotation/Android.bp
index 6b63792..c0364bf 100644
--- a/tests/signature/api-check/system-annotation/Android.bp
+++ b/tests/signature/api-check/system-annotation/Android.bp
@@ -31,7 +31,6 @@
use_embedded_native_libs: false,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/signature/api-check/system-api/Android.mk b/tests/signature/api-check/system-api/Android.mk
index b633daa..c37915b 100644
--- a/tests/signature/api-check/system-api/Android.mk
+++ b/tests/signature/api-check/system-api/Android.mk
@@ -29,7 +29,7 @@
LOCAL_MODULE_STEM := system-all.api.zip
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH = $(TARGET_OUT_DATA_ETC)
-LOCAL_COMPATIBILITY_SUITE := arcts cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := arcts cts general-tests
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(SOONG_ZIP)
$(LOCAL_BUILT_MODULE): PRIVATE_SYSTEM_API_FILES := $(all_system_api_files)
diff --git a/tests/signature/intent-check/Android.bp b/tests/signature/intent-check/Android.bp
index 82fb79e..fc26be9 100644
--- a/tests/signature/intent-check/Android.bp
+++ b/tests/signature/intent-check/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/simplecpu/Android.mk b/tests/simplecpu/Android.mk
index 8e61abc..7d1db20 100644
--- a/tests/simplecpu/Android.mk
+++ b/tests/simplecpu/Android.mk
@@ -30,7 +30,7 @@
LOCAL_PACKAGE_NAME := CtsSimpleCpuTestCases
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := 16
diff --git a/tests/suspendapps/permission/Android.bp b/tests/suspendapps/permission/Android.bp
index 249403c..70278bc 100644
--- a/tests/suspendapps/permission/Android.bp
+++ b/tests/suspendapps/permission/Android.bp
@@ -30,7 +30,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/suspendapps/test-apps/SuspendTestApp/Android.bp b/tests/suspendapps/test-apps/SuspendTestApp/Android.bp
index 05e3e31..cade030 100644
--- a/tests/suspendapps/test-apps/SuspendTestApp/Android.bp
+++ b/tests/suspendapps/test-apps/SuspendTestApp/Android.bp
@@ -25,7 +25,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
@@ -49,7 +48,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/suspendapps/test-apps/TestDeviceAdmin/Android.bp b/tests/suspendapps/test-apps/TestDeviceAdmin/Android.bp
index e8da0dd..4bd551b 100644
--- a/tests/suspendapps/test-apps/TestDeviceAdmin/Android.bp
+++ b/tests/suspendapps/test-apps/TestDeviceAdmin/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/suspendapps/tests/Android.bp b/tests/suspendapps/tests/Android.bp
index 94bb3b6..5c56724 100644
--- a/tests/suspendapps/tests/Android.bp
+++ b/tests/suspendapps/tests/Android.bp
@@ -32,7 +32,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/accounts/Android.bp b/tests/tests/accounts/Android.bp
index 07c749b..7e60638 100644
--- a/tests/tests/accounts/Android.bp
+++ b/tests/tests/accounts/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.bp b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.bp
index 9591f21..2b2980d 100644
--- a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.bp
+++ b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey2",
diff --git a/tests/tests/animation/Android.bp b/tests/tests/animation/Android.bp
index aa5c3d8..d8cbf4d 100644
--- a/tests/tests/animation/Android.bp
+++ b/tests/tests/animation/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/app.usage/Android.bp b/tests/tests/app.usage/Android.bp
index a9aa8f2..75dac41 100644
--- a/tests/tests/app.usage/Android.bp
+++ b/tests/tests/app.usage/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/app.usage/TestApp1/Android.bp b/tests/tests/app.usage/TestApp1/Android.bp
index 6871478..b1c4ced 100644
--- a/tests/tests/app.usage/TestApp1/Android.bp
+++ b/tests/tests/app.usage/TestApp1/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current"
diff --git a/tests/tests/app/Android.bp b/tests/tests/app/Android.bp
index c1e44bb..f090495 100644
--- a/tests/tests/app/Android.bp
+++ b/tests/tests/app/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/appcomponentfactory/Android.bp b/tests/tests/appcomponentfactory/Android.bp
index e34b64a..7c889cf 100644
--- a/tests/tests/appcomponentfactory/Android.bp
+++ b/tests/tests/appcomponentfactory/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/appenumeration/Android.bp b/tests/tests/appenumeration/Android.bp
index c4f82e1..9cbbcaa 100644
--- a/tests/tests/appenumeration/Android.bp
+++ b/tests/tests/appenumeration/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/appenumeration/app/source/Android.bp b/tests/tests/appenumeration/app/source/Android.bp
index dc94a29..731a19c 100644
--- a/tests/tests/appenumeration/app/source/Android.bp
+++ b/tests/tests/appenumeration/app/source/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -38,7 +37,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -50,7 +48,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -62,7 +59,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -74,7 +70,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -86,7 +81,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -98,7 +92,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -110,7 +103,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -122,7 +114,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -134,7 +125,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -146,7 +136,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -158,7 +147,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -170,7 +158,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -182,7 +169,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -194,7 +180,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -206,7 +191,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -218,7 +202,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -230,7 +213,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -241,7 +223,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -253,7 +234,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -265,7 +245,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -277,7 +256,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -289,7 +267,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -301,7 +278,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/appenumeration/app/target/Android.bp b/tests/tests/appenumeration/app/target/Android.bp
index b3afe4b..cd1eb18 100644
--- a/tests/tests/appenumeration/app/target/Android.bp
+++ b/tests/tests/appenumeration/app/target/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -34,7 +33,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -48,7 +46,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -62,7 +59,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -76,7 +72,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -90,7 +85,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -104,7 +98,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -118,7 +111,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -132,7 +124,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -146,7 +137,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -160,7 +150,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/appop/Android.bp b/tests/tests/appop/Android.bp
index 930462b..4779f43 100644
--- a/tests/tests/appop/Android.bp
+++ b/tests/tests/appop/Android.bp
@@ -91,7 +91,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/appop/AppInBackground/Android.bp b/tests/tests/appop/AppInBackground/Android.bp
index b46e877..baa001a 100644
--- a/tests/tests/appop/AppInBackground/Android.bp
+++ b/tests/tests/appop/AppInBackground/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
diff --git a/tests/tests/appop/AppThatCanBeForcedIntoForegroundStates/Android.bp b/tests/tests/appop/AppThatCanBeForcedIntoForegroundStates/Android.bp
index cc1f836..fb06b6e 100644
--- a/tests/tests/appop/AppThatCanBeForcedIntoForegroundStates/Android.bp
+++ b/tests/tests/appop/AppThatCanBeForcedIntoForegroundStates/Android.bp
@@ -23,7 +23,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppThatUsesAppOps/Android.bp b/tests/tests/appop/AppThatUsesAppOps/Android.bp
index 0ba18c3..d4b546c 100644
--- a/tests/tests/appop/AppThatUsesAppOps/Android.bp
+++ b/tests/tests/appop/AppThatUsesAppOps/Android.bp
@@ -57,7 +57,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppToBlame1/Android.bp b/tests/tests/appop/AppToBlame1/Android.bp
index 70d1c6e..9867a6a 100644
--- a/tests/tests/appop/AppToBlame1/Android.bp
+++ b/tests/tests/appop/AppToBlame1/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppToBlame2/Android.bp b/tests/tests/appop/AppToBlame2/Android.bp
index 85f97c9..e11008c 100644
--- a/tests/tests/appop/AppToBlame2/Android.bp
+++ b/tests/tests/appop/AppToBlame2/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppToCollect/Android.bp b/tests/tests/appop/AppToCollect/Android.bp
index 8a1b5a8..1706aea 100644
--- a/tests/tests/appop/AppToCollect/Android.bp
+++ b/tests/tests/appop/AppToCollect/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppWithAttributionInheritingFromExisting/Android.bp b/tests/tests/appop/AppWithAttributionInheritingFromExisting/Android.bp
index 8fd4431..10f916a 100644
--- a/tests/tests/appop/AppWithAttributionInheritingFromExisting/Android.bp
+++ b/tests/tests/appop/AppWithAttributionInheritingFromExisting/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppWithAttributionInheritingFromSameAsOther/Android.bp b/tests/tests/appop/AppWithAttributionInheritingFromSameAsOther/Android.bp
index 8d519dc..2214391 100644
--- a/tests/tests/appop/AppWithAttributionInheritingFromSameAsOther/Android.bp
+++ b/tests/tests/appop/AppWithAttributionInheritingFromSameAsOther/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppWithAttributionInheritingFromSelf/Android.bp b/tests/tests/appop/AppWithAttributionInheritingFromSelf/Android.bp
index eab4652..2317c70 100644
--- a/tests/tests/appop/AppWithAttributionInheritingFromSelf/Android.bp
+++ b/tests/tests/appop/AppWithAttributionInheritingFromSelf/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppWithDuplicateAttribution/Android.bp b/tests/tests/appop/AppWithDuplicateAttribution/Android.bp
index cab076c..f1e7068 100644
--- a/tests/tests/appop/AppWithDuplicateAttribution/Android.bp
+++ b/tests/tests/appop/AppWithDuplicateAttribution/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppWithLongAttributionTag/Android.bp b/tests/tests/appop/AppWithLongAttributionTag/Android.bp
index e82d3e5..f5afd4e 100644
--- a/tests/tests/appop/AppWithLongAttributionTag/Android.bp
+++ b/tests/tests/appop/AppWithLongAttributionTag/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appop/AppWithTooManyAttributions/Android.bp b/tests/tests/appop/AppWithTooManyAttributions/Android.bp
index 8676715..d681b21 100644
--- a/tests/tests/appop/AppWithTooManyAttributions/Android.bp
+++ b/tests/tests/appop/AppWithTooManyAttributions/Android.bp
@@ -17,7 +17,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/appwidget/Android.bp b/tests/tests/appwidget/Android.bp
index 944ba7f..461b18d 100644
--- a/tests/tests/appwidget/Android.bp
+++ b/tests/tests/appwidget/Android.bp
@@ -38,7 +38,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/appwidget/packages/launchermanifest/Android.bp b/tests/tests/appwidget/packages/launchermanifest/Android.bp
index 5631ea9..313667e 100644
--- a/tests/tests/appwidget/packages/launchermanifest/Android.bp
+++ b/tests/tests/appwidget/packages/launchermanifest/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -38,7 +37,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -54,7 +52,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
diff --git a/tests/tests/appwidget/packages/widgetprovider/Android.bp b/tests/tests/appwidget/packages/widgetprovider/Android.bp
index e526a30..c4a64a8 100644
--- a/tests/tests/appwidget/packages/widgetprovider/Android.bp
+++ b/tests/tests/appwidget/packages/widgetprovider/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -35,7 +34,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -49,7 +47,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/assist/Android.bp b/tests/tests/assist/Android.bp
index 85f4fd4..0f2e412 100644
--- a/tests/tests/assist/Android.bp
+++ b/tests/tests/assist/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/assist/service/Android.bp b/tests/tests/assist/service/Android.bp
index 4b4c66c..20beec5 100644
--- a/tests/tests/assist/service/Android.bp
+++ b/tests/tests/assist/service/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/assist/testapp/Android.bp b/tests/tests/assist/testapp/Android.bp
index 406fe7b..8ba03b7 100644
--- a/tests/tests/assist/testapp/Android.bp
+++ b/tests/tests/assist/testapp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/background/Android.bp b/tests/tests/background/Android.bp
index 3d72351..6d45cc3 100644
--- a/tests/tests/background/Android.bp
+++ b/tests/tests/background/Android.bp
@@ -27,7 +27,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
],
sdk_version: "test_current",
}
diff --git a/tests/tests/batterysaving/Android.bp b/tests/tests/batterysaving/Android.bp
index f00ab52..bbcd8d7 100644
--- a/tests/tests/batterysaving/Android.bp
+++ b/tests/tests/batterysaving/Android.bp
@@ -33,7 +33,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/batterysaving/apps/app_target_api_25/Android.bp b/tests/tests/batterysaving/apps/app_target_api_25/Android.bp
index bf00faf..b65c72d 100644
--- a/tests/tests/batterysaving/apps/app_target_api_25/Android.bp
+++ b/tests/tests/batterysaving/apps/app_target_api_25/Android.bp
@@ -21,7 +21,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/batterysaving/apps/app_target_api_current/Android.bp b/tests/tests/batterysaving/apps/app_target_api_current/Android.bp
index fa42b00..0fe80fd 100644
--- a/tests/tests/batterysaving/apps/app_target_api_current/Android.bp
+++ b/tests/tests/batterysaving/apps/app_target_api_current/Android.bp
@@ -20,7 +20,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/binder_ndk/Android.bp b/tests/tests/binder_ndk/Android.bp
index 36150cd..620f793 100644
--- a/tests/tests/binder_ndk/Android.bp
+++ b/tests/tests/binder_ndk/Android.bp
@@ -18,7 +18,6 @@
compile_multilib: "both",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/bionic/Android.mk b/tests/tests/bionic/Android.mk
index 9c198d2..0bb59ff 100644
--- a/tests/tests/bionic/Android.mk
+++ b/tests/tests/bionic/Android.mk
@@ -48,7 +48,7 @@
LOCAL_CXX_STL := libc++_static
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests mts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests mts
LOCAL_CTS_TEST_PACKAGE := android.bionic
diff --git a/tests/tests/bionic_app/Android.bp b/tests/tests/bionic_app/Android.bp
index 3735430..ac5274e 100644
--- a/tests/tests/bionic_app/Android.bp
+++ b/tests/tests/bionic_app/Android.bp
@@ -24,7 +24,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
],
use_embedded_native_libs: true,
}
diff --git a/tests/tests/bluetooth/Android.bp b/tests/tests/bluetooth/Android.bp
index 421ae7c..a99a09e 100644
--- a/tests/tests/bluetooth/Android.bp
+++ b/tests/tests/bluetooth/Android.bp
@@ -28,7 +28,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/calendarcommon/Android.bp b/tests/tests/calendarcommon/Android.bp
index 4fd328f..55b5180 100644
--- a/tests/tests/calendarcommon/Android.bp
+++ b/tests/tests/calendarcommon/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/calendarprovider/Android.bp b/tests/tests/calendarprovider/Android.bp
index 5410c43..39327ba 100644
--- a/tests/tests/calendarprovider/Android.bp
+++ b/tests/tests/calendarprovider/Android.bp
@@ -4,7 +4,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/car/Android.bp b/tests/tests/car/Android.bp
index 2ca2106..683ee41 100644
--- a/tests/tests/car/Android.bp
+++ b/tests/tests/car/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/carrierapi/Android.bp b/tests/tests/carrierapi/Android.bp
index 2b31e15..0eac60e 100644
--- a/tests/tests/carrierapi/Android.bp
+++ b/tests/tests/carrierapi/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/tests/tests/classloaderfactory/test-memcl/Android.bp b/tests/tests/classloaderfactory/test-memcl/Android.bp
index a54ecb2..e4dafb8 100644
--- a/tests/tests/classloaderfactory/test-memcl/Android.bp
+++ b/tests/tests/classloaderfactory/test-memcl/Android.bp
@@ -18,7 +18,6 @@
srcs: [ ":cts-classloaderfactorytest-srcs" ],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/classloaderfactory/test-pathcl/Android.bp b/tests/tests/classloaderfactory/test-pathcl/Android.bp
index 08bbd85..3622519 100644
--- a/tests/tests/classloaderfactory/test-pathcl/Android.bp
+++ b/tests/tests/classloaderfactory/test-pathcl/Android.bp
@@ -18,7 +18,6 @@
srcs: [ ":cts-classloaderfactorytest-srcs" ],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/colormode/Android.bp b/tests/tests/colormode/Android.bp
index a3fff06..3560a61 100644
--- a/tests/tests/colormode/Android.bp
+++ b/tests/tests/colormode/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/tests/contactsprovider/Android.bp b/tests/tests/contactsprovider/Android.bp
index 3799a0e..975e5bf 100644
--- a/tests/tests/contactsprovider/Android.bp
+++ b/tests/tests/contactsprovider/Android.bp
@@ -6,7 +6,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/contactsprovider/gal/Android.bp b/tests/tests/contactsprovider/gal/Android.bp
index 4804a85..5b2f639 100644
--- a/tests/tests/contactsprovider/gal/Android.bp
+++ b/tests/tests/contactsprovider/gal/Android.bp
@@ -4,7 +4,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/contactsproviderwipe/Android.bp b/tests/tests/contactsproviderwipe/Android.bp
index 548d5e4..c3ce587 100644
--- a/tests/tests/contactsproviderwipe/Android.bp
+++ b/tests/tests/contactsproviderwipe/Android.bp
@@ -30,7 +30,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/content/Android.bp b/tests/tests/content/Android.bp
index 96fed8a..4df740d 100644
--- a/tests/tests/content/Android.bp
+++ b/tests/tests/content/Android.bp
@@ -69,7 +69,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "29",
diff --git a/tests/tests/content/BinderPermissionTestService/Android.bp b/tests/tests/content/BinderPermissionTestService/Android.bp
index 8408547..798f084 100644
--- a/tests/tests/content/BinderPermissionTestService/Android.bp
+++ b/tests/tests/content/BinderPermissionTestService/Android.bp
@@ -24,7 +24,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/tests/tests/content/CtsSyncAccountAccessOtherCertTests/Android.bp b/tests/tests/content/CtsSyncAccountAccessOtherCertTests/Android.bp
index b05bc27..b15e59a 100644
--- a/tests/tests/content/CtsSyncAccountAccessOtherCertTests/Android.bp
+++ b/tests/tests/content/CtsSyncAccountAccessOtherCertTests/Android.bp
@@ -27,7 +27,6 @@
certificate: ":cts-testkey2",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/tests/tests/content/DirectBootUnawareTestApp/Android.bp b/tests/tests/content/DirectBootUnawareTestApp/Android.bp
index 1206cb3..c03d9fc 100644
--- a/tests/tests/content/DirectBootUnawareTestApp/Android.bp
+++ b/tests/tests/content/DirectBootUnawareTestApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "29",
diff --git a/tests/tests/content/HelloWorldApp/Android.bp b/tests/tests/content/HelloWorldApp/Android.bp
index 36bce17..b303c78 100644
--- a/tests/tests/content/HelloWorldApp/Android.bp
+++ b/tests/tests/content/HelloWorldApp/Android.bp
@@ -39,7 +39,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
v4_signature: true,
@@ -53,7 +52,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
v4_signature: true,
diff --git a/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp b/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp
index c08aa30..a618068 100644
--- a/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp
+++ b/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version : "29"
diff --git a/tests/tests/content/SyncAccountAccessStubs/Android.bp b/tests/tests/content/SyncAccountAccessStubs/Android.bp
index 6358d12..1713171 100644
--- a/tests/tests/content/SyncAccountAccessStubs/Android.bp
+++ b/tests/tests/content/SyncAccountAccessStubs/Android.bp
@@ -22,7 +22,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/tests/tests/content/emptytestapp/Android.bp b/tests/tests/content/emptytestapp/Android.bp
index 71baac9..763cf4e 100644
--- a/tests/tests/content/emptytestapp/Android.bp
+++ b/tests/tests/content/emptytestapp/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version : "29"
diff --git a/tests/tests/content/pm/SecureFrp/Android.bp b/tests/tests/content/pm/SecureFrp/Android.bp
index fd921b2..09872e7 100644
--- a/tests/tests/content/pm/SecureFrp/Android.bp
+++ b/tests/tests/content/pm/SecureFrp/Android.bp
@@ -28,7 +28,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/cronet/Android.bp b/tests/tests/cronet/Android.bp
index 620e404..179e6b3 100644
--- a/tests/tests/cronet/Android.bp
+++ b/tests/tests/cronet/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/database/Android.bp b/tests/tests/database/Android.bp
index b340dd6..e2e1f2c 100644
--- a/tests/tests/database/Android.bp
+++ b/tests/tests/database/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Enforce public / test api only
diff --git a/tests/tests/database/apps/Android.bp b/tests/tests/database/apps/Android.bp
index 63feb8f..0f18003 100644
--- a/tests/tests/database/apps/Android.bp
+++ b/tests/tests/database/apps/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
\ No newline at end of file
diff --git a/tests/tests/deviceconfig/Android.bp b/tests/tests/deviceconfig/Android.bp
index d66b6a2..ade7f7c 100644
--- a/tests/tests/deviceconfig/Android.bp
+++ b/tests/tests/deviceconfig/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: ["android.test.base"],
diff --git a/tests/tests/display/Android.bp b/tests/tests/display/Android.bp
index 7e9c848..ef97a61 100644
--- a/tests/tests/display/Android.bp
+++ b/tests/tests/display/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/dpi/Android.bp b/tests/tests/dpi/Android.bp
index f7fc7a0..e3fa2ea 100644
--- a/tests/tests/dpi/Android.bp
+++ b/tests/tests/dpi/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/dpi2/Android.bp b/tests/tests/dpi2/Android.bp
index 6ab3c0a..e38a6fc 100644
--- a/tests/tests/dpi2/Android.bp
+++ b/tests/tests/dpi2/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/dreams/Android.bp b/tests/tests/dreams/Android.bp
index 5746fa4..13c05b8 100644
--- a/tests/tests/dreams/Android.bp
+++ b/tests/tests/dreams/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/drm/Android.bp b/tests/tests/drm/Android.bp
index a06d378..59c23d2 100644
--- a/tests/tests/drm/Android.bp
+++ b/tests/tests/drm/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
jni_libs: [
diff --git a/tests/tests/dynamic_linker/Android.bp b/tests/tests/dynamic_linker/Android.bp
index 8fda181..cc99dad 100644
--- a/tests/tests/dynamic_linker/Android.bp
+++ b/tests/tests/dynamic_linker/Android.bp
@@ -56,7 +56,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
],
use_embedded_native_libs: true,
}
diff --git a/tests/tests/effect/Android.bp b/tests/tests/effect/Android.bp
index fb788fc..5ee5b74 100644
--- a/tests/tests/effect/Android.bp
+++ b/tests/tests/effect/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/tests/externalservice/Android.bp b/tests/tests/externalservice/Android.bp
index baed3a6..c70d41b 100644
--- a/tests/tests/externalservice/Android.bp
+++ b/tests/tests/externalservice/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/externalservice/service/Android.bp b/tests/tests/externalservice/service/Android.bp
index 3511bb6..781d272 100644
--- a/tests/tests/externalservice/service/Android.bp
+++ b/tests/tests/externalservice/service/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/gesture/Android.bp b/tests/tests/gesture/Android.bp
index 0ba1997..0d0f52d 100644
--- a/tests/tests/gesture/Android.bp
+++ b/tests/tests/gesture/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/tests/graphics/Android.bp b/tests/tests/graphics/Android.bp
index fc0622d..3f821b0 100644
--- a/tests/tests/graphics/Android.bp
+++ b/tests/tests/graphics/Android.bp
@@ -37,7 +37,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Enforce public / test api only
diff --git a/tests/tests/gwp-asan/enabled/Android.bp b/tests/tests/gwp-asan/enabled/Android.bp
index b1c0a8e..aadbdde 100644
--- a/tests/tests/gwp-asan/enabled/Android.bp
+++ b/tests/tests/gwp-asan/enabled/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/tests/tests/hardware/Android.bp b/tests/tests/hardware/Android.bp
index d365b37..ea60dda 100644
--- a/tests/tests/hardware/Android.bp
+++ b/tests/tests/hardware/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
compile_multilib: "both",
diff --git a/tests/tests/icu/Android.bp b/tests/tests/icu/Android.bp
index 98c2e65..df1f6d0 100644
--- a/tests/tests/icu/Android.bp
+++ b/tests/tests/icu/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/identity/Android.bp b/tests/tests/identity/Android.bp
index 1501648..203f578 100644
--- a/tests/tests/identity/Android.bp
+++ b/tests/tests/identity/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/tests/tests/instantapp/Android.bp b/tests/tests/instantapp/Android.bp
index 9109578..2a79664 100644
--- a/tests/tests/instantapp/Android.bp
+++ b/tests/tests/instantapp/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"cts",
"vts",
- "vts10",
"device-tests",
],
}
diff --git a/tests/tests/jni/Android.bp b/tests/tests/jni/Android.bp
index ae5778b..8165a9f 100644
--- a/tests/tests/jni/Android.bp
+++ b/tests/tests/jni/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/jvmti/attaching/Android.bp b/tests/tests/jvmti/attaching/Android.bp
index 54761ad..eb7f31f 100644
--- a/tests/tests/jvmti/attaching/Android.bp
+++ b/tests/tests/jvmti/attaching/Android.bp
@@ -17,7 +17,6 @@
defaults: ["cts_defaults"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/keystore/Android.bp b/tests/tests/keystore/Android.bp
index cda2770..0fa7cf7 100644
--- a/tests/tests/keystore/Android.bp
+++ b/tests/tests/keystore/Android.bp
@@ -35,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/tests/tests/libcoreapievolution/Android.bp b/tests/tests/libcoreapievolution/Android.bp
index 387f2f7..8cecd94 100644
--- a/tests/tests/libcoreapievolution/Android.bp
+++ b/tests/tests/libcoreapievolution/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/libcorefileio/Android.bp b/tests/tests/libcorefileio/Android.bp
index 48b3f87..e910c2f 100644
--- a/tests/tests/libcorefileio/Android.bp
+++ b/tests/tests/libcorefileio/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/libcorelegacy22/Android.bp b/tests/tests/libcorelegacy22/Android.bp
index f199af9..eb64d08 100644
--- a/tests/tests/libcorelegacy22/Android.bp
+++ b/tests/tests/libcorelegacy22/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/libthermalndk/Android.bp b/tests/tests/libthermalndk/Android.bp
index 9bc4fe3..ba58f2d 100644
--- a/tests/tests/libthermalndk/Android.bp
+++ b/tests/tests/libthermalndk/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/match_flags/Android.bp b/tests/tests/match_flags/Android.bp
index b29d3e0..4a40784 100644
--- a/tests/tests/match_flags/Android.bp
+++ b/tests/tests/match_flags/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/match_flags/app/a/Android.bp b/tests/tests/match_flags/app/a/Android.bp
index a843990..8513fad 100644
--- a/tests/tests/match_flags/app/a/Android.bp
+++ b/tests/tests/match_flags/app/a/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/match_flags/app/b/Android.bp b/tests/tests/match_flags/app/b/Android.bp
index 87c417c..868fa34 100644
--- a/tests/tests/match_flags/app/b/Android.bp
+++ b/tests/tests/match_flags/app/b/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/media/Android.bp b/tests/tests/media/Android.bp
index ce94d43..b7c40ad 100644
--- a/tests/tests/media/Android.bp
+++ b/tests/tests/media/Android.bp
@@ -75,7 +75,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/media/src/android/media/cts/AudioPlaybackConfigurationTest.java b/tests/tests/media/src/android/media/cts/AudioPlaybackConfigurationTest.java
index 21f7a1b..04023fd 100644
--- a/tests/tests/media/src/android/media/cts/AudioPlaybackConfigurationTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioPlaybackConfigurationTest.java
@@ -26,23 +26,28 @@
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.SoundPool;
+import android.net.Uri;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Parcel;
+import android.platform.test.annotations.AppModeFull;
import android.util.Log;
import android.media.AudioPlaybackConfiguration;
import com.android.compatibility.common.util.CtsAndroidTestCase;
import com.android.internal.annotations.GuardedBy;
+import java.io.File;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+@AppModeFull(reason = "Instant apps cannot access the SD card")
public class AudioPlaybackConfigurationTest extends CtsAndroidTestCase {
private final static String TAG = "AudioPlaybackConfigurationTest";
+ static final String mInpPrefix = WorkDir.getMediaDirString();
private final static int TEST_TIMING_TOLERANCE_MS = 150;
private final static int TEST_TIMEOUT_SOUNDPOOL_LOAD_MS = 3000;
@@ -85,8 +90,9 @@
.setContentType(TEST_CONTENT)
.setAllowedCapturePolicy(ALLOW_CAPTURE_BY_NONE)
.build();
- mMp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong,
- aa, am.generateAudioSessionId());
+ mMp = MediaPlayer.create(getContext(),
+ Uri.fromFile(new File(mInpPrefix + "sine1khzs40dblong.mp3")), null, aa,
+ am.generateAudioSessionId());
mMp.start();
Thread.sleep(TEST_TIMING_TOLERANCE_MS);// waiting for playback to start
List<AudioPlaybackConfiguration> configs = am.getActivePlaybackConfigurations();
@@ -133,8 +139,9 @@
List<AudioPlaybackConfiguration> configs = am.getActivePlaybackConfigurations();
final int nbActivePlayersBeforeStart = configs.size();
- mMp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong,
- aa, am.generateAudioSessionId());
+ mMp = MediaPlayer.create(getContext(),
+ Uri.fromFile(new File(mInpPrefix + "sine1khzs40dblong.mp3")), null, aa,
+ am.generateAudioSessionId());
configs = am.getActivePlaybackConfigurations();
assertEquals("inactive MediaPlayer, number of configs shouldn't have changed",
nbActivePlayersBeforeStart /*expected*/, configs.size());
@@ -194,8 +201,9 @@
.setContentType(TEST_CONTENT)
.build();
- mMp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong,
- aa, am.generateAudioSessionId());
+ mMp = MediaPlayer.create(getContext(),
+ Uri.fromFile(new File(mInpPrefix + "sine1khzs40dblong.mp3")), null, aa,
+ am.generateAudioSessionId());
MyAudioPlaybackCallback callback = new MyAudioPlaybackCallback();
am.registerAudioPlaybackCallback(callback, h /*handler*/);
@@ -258,8 +266,9 @@
.setContentType(TEST_CONTENT)
.build();
- mMp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong,
- aa, am.generateAudioSessionId());
+ mMp = MediaPlayer.create(getContext(),
+ Uri.fromFile(new File(mInpPrefix + "sine1khzs40dblong.mp3")), null, aa,
+ am.generateAudioSessionId());
MyAudioPlaybackCallback callback = new MyAudioPlaybackCallback();
am.registerAudioPlaybackCallback(callback, h /*handler*/);
@@ -336,7 +345,7 @@
}
}
});
- final int loadId = mSp.load(getContext(), R.raw.sine1320hz5sec, 1/*priority*/);
+ final int loadId = mSp.load(mInpPrefix + "sine1320hz5sec.wav", 1/*priority*/);
synchronized (loadLock) {
loadLock.wait(TEST_TIMEOUT_SOUNDPOOL_LOAD_MS);
}
diff --git a/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java b/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java
index 752fcb2..4579567 100644
--- a/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java
+++ b/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java
@@ -46,6 +46,7 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
+import android.os.ParcelFileDescriptor;
import android.os.SystemClock;
import android.util.Log;
import android.util.Pair;
@@ -70,6 +71,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.FileNotFoundException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
@@ -362,7 +364,7 @@
private boolean setExtractorDataSource(VideoFormat videoFormat) {
checkNotNull(videoFormat);
try {
- final AssetFileDescriptor afd = videoFormat.getAssetFileDescriptor(context);
+ final AssetFileDescriptor afd = videoFormat.getAssetFileDescriptor();
extractor.setDataSource(
afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
@@ -1663,13 +1665,11 @@
return getParsedName().toPrettyString();
}
- public AssetFileDescriptor getAssetFileDescriptor(Context context) {
- try {
- return context.getAssets().openFd(filename);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
+ public AssetFileDescriptor getAssetFileDescriptor() throws FileNotFoundException {
+ File inpFile = new File(WorkDir.getMediaDirString() + "assets/decode_accuracy/" + filename);
+ ParcelFileDescriptor parcelFD =
+ ParcelFileDescriptor.open(inpFile, ParcelFileDescriptor.MODE_READ_ONLY);
+ return new AssetFileDescriptor(parcelFD, 0, parcelFD.getStatSize());
}
}
diff --git a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
index 58293f9..258fd7a 100644
--- a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
@@ -18,13 +18,12 @@
import android.media.cts.R;
-import android.content.Context;
import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
import android.media.MediaCodec;
import android.media.MediaCodecInfo;
import android.media.MediaExtractor;
import android.media.MediaFormat;
+import android.os.ParcelFileDescriptor;
import android.platform.test.annotations.AppModeFull;
import android.util.Log;
import android.util.Range;
@@ -36,6 +35,9 @@
import com.android.compatibility.common.util.Stat;
import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Arrays;
@@ -62,10 +64,11 @@
private static final String REPORT_LOG_NAME = "CtsMediaTestCases";
private static final String TAG = "DecoderConformanceTest";
- private Resources mResources;
+ private static final String CONFORMANCE_SUBDIR = "conformance_vectors/";
private DeviceReportLog mReportLog;
private MediaCodec mDecoder;
private MediaExtractor mExtractor;
+ static final String mInpPrefix = WorkDir.getMediaDirString() + CONFORMANCE_SUBDIR;
private static final Map<String, String> MIMETYPE_TO_TAG = new HashMap <String, String>() {{
put(MediaFormat.MIMETYPE_VIDEO_VP9, "vp9");
@@ -74,7 +77,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mResources = mContext.getResources();
}
@Override
@@ -84,8 +86,7 @@
private List<String> readResourceLines(String fileName) throws Exception {
- int resId = mResources.getIdentifier(fileName, "raw", mContext.getPackageName());
- InputStream is = mContext.getResources().openRawResource(resId);
+ InputStream is = new FileInputStream(mInpPrefix + fileName);
BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
// Read the file line by line.
@@ -131,11 +132,21 @@
mExtractor = null;
}
- private Status decodeTestVector(String mime, String decoderName, String vectorName) throws Exception {
- int resId = mResources.getIdentifier(vectorName, "raw", mContext.getPackageName());
- AssetFileDescriptor testFd = mResources.openRawResourceFd(resId);
+ protected static AssetFileDescriptor getAssetFileDescriptorFor(final String res, String mime)
+ throws FileNotFoundException {
+ String tag = MIMETYPE_TO_TAG.get(mime);
+ File inpFile = new File(mInpPrefix + res + "." + tag);
+ ParcelFileDescriptor parcelFD =
+ ParcelFileDescriptor.open(inpFile, ParcelFileDescriptor.MODE_READ_ONLY);
+ return new AssetFileDescriptor(parcelFD, 0, parcelFD.getStatSize());
+ }
+
+ private Status decodeTestVector(String mime, String decoderName, String vectorName)
+ throws Exception {
+ AssetFileDescriptor testFd = getAssetFileDescriptorFor(vectorName, mime);
mExtractor = new MediaExtractor();
- mExtractor.setDataSource(testFd.getFileDescriptor(), testFd.getStartOffset(), testFd.getLength());
+ mExtractor.setDataSource(testFd.getFileDescriptor(), testFd.getStartOffset(),
+ testFd.getLength());
mExtractor.selectTrack(0);
mDecoder = MediaCodec.createByCodecName(decoderName);
@@ -182,6 +193,7 @@
}
} catch (Exception e) {
Log.e(TAG, "Decode " + vectorName + " fail");
+ fail("Received exception " + e);
}
String streamName = "decoder_conformance_test";
diff --git a/tests/tests/media/src/android/media/cts/MediaExtractorTest.java b/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
index 6bc5f86..c0b297f 100644
--- a/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
@@ -102,7 +102,9 @@
return ds;
}
- public void testNullMediaDataSourceIsRejected() throws Exception {
+ public void SKIP_testNullMediaDataSourceIsRejected() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorUnitTest$TestApi
+ // #testIfNullMediaDataSourceIsRejectedBySetDataSource
try {
mExtractor.setDataSource((MediaDataSource)null);
fail("Expected IllegalArgumentException.");
@@ -111,13 +113,16 @@
}
}
- public void testMediaDataSourceIsClosedOnRelease() throws Exception {
+ public void SKIP_testMediaDataSourceIsClosedOnRelease() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$SetDataSourceTest#testMediaDataSource
TestMediaDataSource dataSource = setDataSource("testvideo.3gp");
mExtractor.release();
assertTrue(dataSource.isClosed());
}
- public void testExtractorFailsIfMediaDataSourceThrows() throws Exception {
+ public void SKIP_testExtractorFailsIfMediaDataSourceThrows() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorUnitTest$TestApi
+ // #testIfInvalidDataSourceIsRejectedBySetDataSource
TestMediaDataSource dataSource = getDataSourceFor("testvideo.3gp");
dataSource.throwFromReadAt();
try {
@@ -128,7 +133,9 @@
}
}
- public void testExtractorFailsIfMediaDataSourceReturnsAnError() throws Exception {
+ public void SKIP_testExtractorFailsIfMediaDataSourceReturnsAnError() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorUnitTest$TestApi
+ // #testIfInvalidDataSourceIsRejectedBySetDataSource
TestMediaDataSource dataSource = getDataSourceFor("testvideo.3gp");
dataSource.returnFromReadAt(-2);
try {
@@ -140,13 +147,17 @@
}
// Smoke test MediaExtractor reading from a DataSource.
- public void testExtractFromAMediaDataSource() throws Exception {
+ public void SKIP_testExtractFromAMediaDataSource() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$SetDataSourceTest#testMediaDataSource and
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest#testMetrics
TestMediaDataSource dataSource = setDataSource("testvideo.3gp");
checkExtractorSamplesAndMetrics();
}
// Smoke test MediaExtractor reading from an AssetFileDescriptor.
- public void testExtractFromAssetFileDescriptor() throws Exception {
+ public void SKIP_testExtractFromAssetFileDescriptor() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$SetDataSourceTest#testAssetFD and
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest#testMetrics
AssetFileDescriptor afd = getAssetFileDescriptorFor("testvideo.3gp");
mExtractor.setDataSource(afd);
checkExtractorSamplesAndMetrics();
@@ -201,7 +212,8 @@
}
// DolbyVisionMediaExtractor for profile-level (DvheStn/Fhd60).
- public void testDolbyVisionMediaExtractorProfileDvheStn() throws Exception {
+ public void SKIP_testDolbyVisionMediaExtractorProfileDvheStn() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$ValidateKeyValuePairs[video/dolby-vision]
TestMediaDataSource dataSource = setDataSource("video_dovi_1920x1080_60fps_dvhe_05.mp4");
if (MediaUtils.hasDecoder(MIMETYPE_VIDEO_DOLBY_VISION)) {
@@ -548,7 +560,8 @@
}
@AppModeFull(reason = "Instant apps cannot bind sockets.")
- public void testExtractorGetCachedDuration() throws Exception {
+ public void SKIP_testExtractorGetCachedDuration() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$SetDataSourceTest#testUrlDataSource
CtsTestServer foo = new CtsTestServer(getContext());
String url = foo.getAssetUrl("ringer.mp3");
mExtractor.setDataSource(url);
@@ -557,7 +570,8 @@
foo.shutdown();
}
- public void testExtractorHasCacheReachedEndOfStream() throws Exception {
+ public void SKIP_testExtractorHasCacheReachedEndOfStream() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$SetDataSourceTest#testUrlDataSource
// Using file source to get deterministic result.
AssetFileDescriptor afd = getAssetFileDescriptorFor("testvideo.3gp");
mExtractor.setDataSource(afd);
@@ -569,7 +583,8 @@
* Makes sure if PTS(order) of a video file with BFrames matches the expected values in
* the corresponding text file with just PTS values.
*/
- public void testVideoPresentationTimeStampsMatch() throws Exception {
+ public void SKIP_testVideoPresentationTimeStampsMatch() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$ExtractorTimeStampTest
setDataSource("binary_counter_320x240_30fps_600frames.mp4");
// Select the only video track present in the file.
final int trackCount = mExtractor.getTrackCount();
@@ -754,7 +769,9 @@
}
@SmallTest
- public void testFlacIdentity() throws Exception {
+ public void SKIP_testFlacIdentity() throws Exception {
+ // duplicate of CtsMediaV2TestCases:CodecEncoderTest$testLosslessEncodeDecode[audio/flac]
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FusedExtractorDecoderTest[audio/flac]
final int PCM_FRAMES = 1152 * 4; // FIXME: requires 4 flac frames to work with OMX codecs.
final int CHANNEL_COUNT = 2;
final int SAMPLES = PCM_FRAMES * CHANNEL_COUNT;
@@ -795,7 +812,8 @@
}
}
- public void testFlacMovExtraction() throws Exception {
+ public void SKIP_testFlacMovExtraction() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FusedExtractorDecoderTest[audio/flac]
AssetFileDescriptor testFd = getAssetFileDescriptorFor("sinesweepalac.mov");
MediaExtractor extractor = new MediaExtractor();
extractor.setDataSource(testFd.getFileDescriptor(), testFd.getStartOffset(),
@@ -925,7 +943,9 @@
extractor.release();
}
- public void testAdvance() throws Exception {
+ public void SKIP_testAdvance() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$SetDataSourceTest and
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest#testExtract[*]
// audio-only
doTestAdvance("sinesweepm4a.m4a");
doTestAdvance("sinesweepmp3lame.mp3");
@@ -961,27 +981,32 @@
} while (mExtractor.advance());
}
- public void testAC3inMP4() throws Exception {
+ public void SKIP_testAC3inMP4() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest[audio/ac3]
setDataSource("testac3mp4.mp4");
readAllData();
}
- public void testEAC3inMP4() throws Exception {
+ public void SKIP_testEAC3inMP4() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest[audio/eac3]
setDataSource("testeac3mp4.mp4");
readAllData();
}
- public void testAC3inTS() throws Exception {
+ public void SKIP_testAC3inTS() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest[audio/ac3]
setDataSource("testac3ts.ts");
readAllData();
}
- public void testEAC3inTS() throws Exception {
+ public void SKIP_testEAC3inTS() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest[audio/eac3]
setDataSource("testeac3ts.ts");
readAllData();
}
- public void testAC4inMP4() throws Exception {
+ public void SKIP_testAC4inMP4() throws Exception {
+ // duplicate of CtsMediaV2TestCases:ExtractorTest$FunctionalityTest[audio/ac4]
setDataSource("multi0.mp4");
readAllData();
}
diff --git a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
index 461682a..24a598a 100644
--- a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
@@ -23,7 +23,6 @@
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
@@ -33,7 +32,7 @@
import android.media.MediaFormat;
import android.media.MediaMetadataRetriever;
import android.media.MediaRecorder;
-import android.media.cts.R;
+import android.os.ParcelFileDescriptor;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
@@ -70,7 +69,7 @@
private static final boolean SAVE_BITMAP_OUTPUT = false;
private static final String TEST_MEDIA_FILE = "retriever_test.3gp";
- protected Resources mResources;
+ static final String mInpPrefix = WorkDir.getMediaDirString();
protected MediaMetadataRetriever mRetriever;
private PackageManager mPackageManager;
@@ -92,7 +91,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mResources = getContext().getResources();
mRetriever = new MediaMetadataRetriever();
mPackageManager = getContext().getPackageManager();
}
@@ -107,9 +105,17 @@
}
}
- protected void setDataSourceFd(int resid) {
+ protected AssetFileDescriptor getAssetFileDescriptorFor(final String res)
+ throws FileNotFoundException {
+ File inpFile = new File(mInpPrefix + res);
+ ParcelFileDescriptor parcelFD =
+ ParcelFileDescriptor.open(inpFile, ParcelFileDescriptor.MODE_READ_ONLY);
+ return new AssetFileDescriptor(parcelFD, 0, parcelFD.getStatSize());
+ }
+
+ protected void setDataSourceFd(final String res) {
try {
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
mRetriever.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
} catch (Exception e) {
@@ -117,10 +123,10 @@
}
}
- protected TestMediaDataSource setDataSourceCallback(int resid) {
+ protected TestMediaDataSource setDataSourceCallback(final String res) {
TestMediaDataSource ds = null;
try {
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
ds = TestMediaDataSource.fromAssetFd(afd);
mRetriever.setDataSource(ds);
} catch (Exception e) {
@@ -129,10 +135,10 @@
return ds;
}
- protected TestMediaDataSource getFaultyDataSource(int resid, boolean throwing) {
+ protected TestMediaDataSource getFaultyDataSource(final String res, boolean throwing) {
TestMediaDataSource ds = null;
try {
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
ds = TestMediaDataSource.fromAssetFd(afd);
if (throwing) {
ds.throwFromReadAt();
@@ -146,7 +152,7 @@
}
public void testAudioMetadata() {
- setDataSourceCallback(R.raw.audio_with_metadata);
+ setDataSourceCallback("audio_with_metadata.mp3");
assertEquals("Title was other than expected",
"Chimey Phone",
@@ -179,7 +185,7 @@
}
public void test3gppMetadata() {
- setDataSourceCallback(R.raw.testvideo);
+ setDataSourceCallback("testvideo.3gp");
assertEquals("Title was other than expected",
"Title", mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE));
@@ -275,7 +281,8 @@
}
public void testID3v2Metadata() {
- setDataSourceFd(R.raw.video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2);
+ setDataSourceFd(
+ "video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2.mp4");
assertEquals("Title was other than expected",
"Title", mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE));
@@ -371,14 +378,14 @@
}
public void testID3v2Unsynchronization() {
- setDataSourceFd(R.raw.testmp3_4);
+ setDataSourceFd("testmp3_4.mp3");
assertEquals("Mime type was other than expected",
"audio/mpeg",
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE));
}
public void testID3v240ExtHeader() {
- setDataSourceFd(R.raw.sinesweepid3v24ext);
+ setDataSourceFd("sinesweepid3v24ext.mp3");
assertEquals("Mime type was other than expected",
"audio/mpeg",
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE));
@@ -390,7 +397,7 @@
}
public void testID3v230ExtHeader() {
- setDataSourceFd(R.raw.sinesweepid3v23ext);
+ setDataSourceFd("sinesweepid3v23ext.mp3");
assertEquals("Mime type was other than expected",
"audio/mpeg",
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE));
@@ -402,7 +409,7 @@
}
public void testID3v230ExtHeaderBigEndian() {
- setDataSourceFd(R.raw.sinesweepid3v23extbe);
+ setDataSourceFd("sinesweepid3v23extbe.mp3");
assertEquals("Mime type was other than expected",
"audio/mpeg",
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE));
@@ -414,7 +421,7 @@
}
public void testMp4AlbumArt() {
- setDataSourceFd(R.raw.swirl_128x128_h264_albumart);
+ setDataSourceFd("swirl_128x128_h264_albumart.mp4");
assertEquals("Mime type was other than expected",
"video/mp4",
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE));
@@ -425,21 +432,21 @@
public void testGenreParsing() {
if (!MediaUtils.check(mIsAtLeastR, "test needs Android 11")) return;
Object [][] genres = {
- { R.raw.id3test0, null },
- { R.raw.id3test1, "Country" },
- { R.raw.id3test2, "Classic Rock, Android" },
- { R.raw.id3test3, null },
- { R.raw.id3test4, "Classic Rock, (Android)" },
- { R.raw.id3test5, null },
- { R.raw.id3test6, "Funk, Grunge, Hip-Hop" },
- { R.raw.id3test7, null },
- { R.raw.id3test8, "Disco" },
- { R.raw.id3test9, "Cover" },
- { R.raw.id3test10, "Pop, Remix" },
- { R.raw.id3test11, "Remix" },
+ { "id3test0.mp3", null },
+ { "id3test1.mp3", "Country" },
+ { "id3test2.mp3", "Classic Rock, Android" },
+ { "id3test3.mp3", null },
+ { "id3test4.mp3", "Classic Rock, (Android)" },
+ { "id3test5.mp3", null },
+ { "id3test6.mp3", "Funk, Grunge, Hip-Hop" },
+ { "id3test7.mp3", null },
+ { "id3test8.mp3", "Disco" },
+ { "id3test9.mp3", "Cover" },
+ { "id3test10.mp3", "Pop, Remix" },
+ { "id3test11.mp3", "Remix" },
};
for (Object [] genre: genres) {
- setDataSourceFd((Integer)genre[0] /* resource id */);
+ setDataSourceFd((String)genre[0] /* resource id */);
assertEquals("Unexpected genre: ",
genre[1] /* genre */,
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_GENRE));
@@ -447,7 +454,7 @@
}
public void testBitsPerSampleAndSampleRate() {
- setDataSourceFd(R.raw.testwav_16bit_44100hz);
+ setDataSourceFd("testwav_16bit_44100hz.wav");
assertEquals("Bits per sample was other than expected",
"16",
@@ -460,18 +467,18 @@
}
public void testGetEmbeddedPicture() {
- setDataSourceFd(R.raw.largealbumart);
+ setDataSourceFd("largealbumart.mp3");
assertNotNull("couldn't retrieve album art", mRetriever.getEmbeddedPicture());
}
public void testAlbumArtInOgg() throws Exception {
- setDataSourceFd(R.raw.sinesweepoggalbumart);
+ setDataSourceFd("sinesweepoggalbumart.ogg");
assertNotNull("couldn't retrieve album art from ogg", mRetriever.getEmbeddedPicture());
}
public void testSetDataSourcePath() {
- copyMeidaFile();
+ copyMediaFile();
File file = new File(Environment.getExternalStorageDirectory(), TEST_MEDIA_FILE);
try {
mRetriever.setDataSource(file.getAbsolutePath());
@@ -481,7 +488,7 @@
}
public void testSetDataSourceUri() {
- copyMeidaFile();
+ copyMediaFile();
File file = new File(Environment.getExternalStorageDirectory(), TEST_MEDIA_FILE);
try {
Uri uri = Uri.parse(file.getAbsolutePath());
@@ -519,14 +526,14 @@
}
public void testMediaDataSourceIsClosedOnRelease() throws Exception {
- TestMediaDataSource dataSource = setDataSourceCallback(R.raw.testvideo);
+ TestMediaDataSource dataSource = setDataSourceCallback("testvideo.3gp");
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE);
mRetriever.release();
assertTrue(dataSource.isClosed());
}
public void testRetrieveFailsIfMediaDataSourceThrows() throws Exception {
- TestMediaDataSource ds = getFaultyDataSource(R.raw.testvideo, true /* throwing */);
+ TestMediaDataSource ds = getFaultyDataSource("testvideo.3gp", true /* throwing */);
try {
mRetriever.setDataSource(ds);
fail("Failed to throw exceptions");
@@ -536,7 +543,7 @@
}
public void testRetrieveFailsIfMediaDataSourceReturnsAnError() throws Exception {
- TestMediaDataSource ds = getFaultyDataSource(R.raw.testvideo, false /* throwing */);
+ TestMediaDataSource ds = getFaultyDataSource("testvideo.3gp", false /* throwing */);
try {
mRetriever.setDataSource(ds);
fail("Failed to throw exceptions");
@@ -545,20 +552,21 @@
}
}
- private void testThumbnail(int resId, int targetWdith, int targetHeight) {
- testThumbnail(resId, null /*outPath*/, targetWdith, targetHeight);
+ private void testThumbnail(final String res, int targetWdith, int targetHeight) {
+ testThumbnail(res, null /*outPath*/, targetWdith, targetHeight);
}
- private void testThumbnail(int resId, String outPath, int targetWidth, int targetHeight) {
+ private void testThumbnail(final String res, String outPath, int targetWidth,
+ int targetHeight) {
Stopwatch timer = new Stopwatch();
- if (!MediaUtils.hasCodecForResourceAndDomain(getContext(), resId, "video/")) {
+ setDataSourceFd(res);
+
+ if (!MediaUtils.hasCodecForResourceAndDomain(res, "video/")) {
MediaUtils.skipTest("no video codecs for resource");
return;
}
- setDataSourceFd(resId);
-
timer.start();
Bitmap thumbnail = mRetriever.getFrameAtTime(-1 /* timeUs (any) */);
timer.end();
@@ -594,39 +602,39 @@
public void testThumbnailH264() {
testThumbnail(
- R.raw.bbb_s4_1280x720_mp4_h264_mp31_8mbps_30fps_aac_he_mono_40kbps_44100hz,
+ "bbb_s4_1280x720_mp4_h264_mp31_8mbps_30fps_aac_he_mono_40kbps_44100hz.mp4",
1280,
720);
}
public void testThumbnailH263() {
- testThumbnail(R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz, 176, 144);
+ testThumbnail("video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp", 176, 144);
}
public void testThumbnailMPEG4() {
testThumbnail(
- R.raw.video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz,
+ "video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
1280,
720);
}
public void testThumbnailVP8() {
testThumbnail(
- R.raw.bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz,
+ "bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz.webm",
640,
360);
}
public void testThumbnailVP9() {
testThumbnail(
- R.raw.bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz,
+ "bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm",
640,
360);
}
public void testThumbnailHEVC() {
testThumbnail(
- R.raw.bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz,
+ "bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz.mp4",
720,
480);
}
@@ -634,31 +642,31 @@
public void testThumbnailVP9Hdr() {
if (!MediaUtils.check(mIsAtLeastR, "test needs Android 11")) return;
- testThumbnail(R.raw.video_1280x720_vp9_hdr_static_3mbps, 1280, 720);
+ testThumbnail("video_1280x720_vp9_hdr_static_3mbps.mkv", 1280, 720);
}
public void testThumbnailAV1Hdr() {
if (!MediaUtils.check(mIsAtLeastR, "test needs Android 11")) return;
- testThumbnail(R.raw.video_1280x720_av1_hdr_static_3mbps, 1280, 720);
+ testThumbnail("video_1280x720_av1_hdr_static_3mbps.webm", 1280, 720);
}
public void testThumbnailHDR10() {
if (!MediaUtils.check(mIsAtLeastR, "test needs Android 11")) return;
- testThumbnail(R.raw.video_1280x720_hevc_hdr10_static_3mbps, 1280, 720);
+ testThumbnail("video_1280x720_hevc_hdr10_static_3mbps.mp4", 1280, 720);
}
- private void testThumbnailWithRotation(int resId, int targetRotation) {
+ private void testThumbnailWithRotation(final String res, int targetRotation) {
Stopwatch timer = new Stopwatch();
- if (!MediaUtils.hasCodecForResourceAndDomain(getContext(), resId, "video/")) {
+ setDataSourceFd(res);
+
+ if (!MediaUtils.hasCodecForResourceAndDomain(res, "video/")) {
MediaUtils.skipTest("no video codecs for resource");
return;
}
- setDataSourceFd(resId);
-
assertEquals("Video rotation was other than expected", Integer.toString(targetRotation),
mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION));
@@ -671,11 +679,11 @@
}
public void testThumbnailWithRotation() {
- int[] resIds = {R.raw.video_h264_mpeg4_rotate_0, R.raw.video_h264_mpeg4_rotate_90,
- R.raw.video_h264_mpeg4_rotate_180, R.raw.video_h264_mpeg4_rotate_270};
+ String[] res = {"video_h264_mpeg4_rotate_0.mp4", "video_h264_mpeg4_rotate_90.mp4",
+ "video_h264_mpeg4_rotate_180.mp4", "video_h264_mpeg4_rotate_270.mp4"};
int[] targetRotations = {0, 90, 180, 270};
- for (int i = 0; i < resIds.length; i++) {
- testThumbnailWithRotation(resIds[i], targetRotations[i]);
+ for (int i = 0; i < res.length; i++) {
+ testThumbnailWithRotation(res[i], targetRotations[i]);
}
}
@@ -861,32 +869,34 @@
}
private void testGetFrameAt(int[][] testCases,
- Function<MediaMetadataRetriever, List<Bitmap> > bitmapRetriever) {
- testGetFrameAt(R.raw.binary_counter_320x240_30fps_600frames,
+ Function<MediaMetadataRetriever, List<Bitmap>> bitmapRetriever) {
+ testGetFrameAt("binary_counter_320x240_30fps_600frames.mp4",
testCases, bitmapRetriever);
}
private void testGetFrameAtEditList(int[][] testCases,
- Function<MediaMetadataRetriever, List<Bitmap> > bitmapRetriever) {
- testGetFrameAt(R.raw.binary_counter_320x240_30fps_600frames_editlist,
+ Function<MediaMetadataRetriever, List<Bitmap>> bitmapRetriever) {
+ testGetFrameAt("binary_counter_320x240_30fps_600frames_editlist.mp4",
testCases, bitmapRetriever);
}
private void testGetFrameAtEmptyNormalEditList(int[][] testCases,
- Function<MediaMetadataRetriever, List<Bitmap> > bitmapRetriever) {
- testGetFrameAt(R.raw.binary_counter_320x240_30fps_600frames_empty_normal_editlist_entries,
+ Function<MediaMetadataRetriever, List<Bitmap>> bitmapRetriever) {
+ testGetFrameAt("binary_counter_320x240_30fps_600frames_empty_normal_editlist_entries.mp4",
testCases, bitmapRetriever);
}
- private void testGetFrameAt(int resId, int[][] testCases,
- Function<MediaMetadataRetriever, List<Bitmap> > bitmapRetriever) {
- if (!MediaUtils.hasCodecForResourceAndDomain(getContext(), resId, "video/")
+
+ private void testGetFrameAt(final String res, int[][] testCases,
+ Function<MediaMetadataRetriever, List<Bitmap>> bitmapRetriever) {
+
+ setDataSourceFd(res);
+
+ if (!MediaUtils.hasCodecForResourceAndDomain(res, "video/")
&& mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
MediaUtils.skipTest("no video codecs for resource on watch");
return;
}
- setDataSourceFd(resId);
-
List<Bitmap> bitmaps = bitmapRetriever.apply(mRetriever);
for (int i = 0; i < testCases.length; i++) {
verifyVideoFrame(bitmaps.get(i), testCases[i]);
@@ -925,30 +935,29 @@
* The following tests verifies MediaMetadataRetriever.getScaledFrameAtTime behavior.
*/
public void testGetScaledFrameAtTimeWithInvalidResolutions() {
- int[] resIds = {R.raw.binary_counter_320x240_30fps_600frames,
- R.raw.binary_counter_320x240_30fps_600frames_editlist,
- R.raw.bbb_s4_1280x720_mp4_h264_mp31_8mbps_30fps_aac_he_mono_40kbps_44100hz,
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz,
- R.raw.video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz,
- R.raw.bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz,
- R.raw.bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz,
- R.raw.bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz,
- R.raw.video_1280x720_vp9_hdr_static_3mbps,
- R.raw.video_1280x720_av1_hdr_static_3mbps,
- R.raw.video_1280x720_hevc_hdr10_static_3mbps};
+ String[] resources = {"binary_counter_320x240_30fps_600frames.mp4",
+ "binary_counter_320x240_30fps_600frames_editlist.mp4",
+ "bbb_s4_1280x720_mp4_h264_mp31_8mbps_30fps_aac_he_mono_40kbps_44100hz.mp4",
+ "video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp",
+ "video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
+ "bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz.webm",
+ "bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm",
+ "bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz.mp4",
+ "video_1280x720_vp9_hdr_static_3mbps.mkv",
+ "video_1280x720_av1_hdr_static_3mbps.webm",
+ "video_1280x720_hevc_hdr10_static_3mbps.mp4"};
int[][] resolutions = {{0, 120}, {-1, 0}, {-1, 120}, {140, -1}, {-1, -1}};
int[] options =
{OPTION_CLOSEST, OPTION_CLOSEST_SYNC, OPTION_NEXT_SYNC, OPTION_PREVIOUS_SYNC};
- for (int resId : resIds) {
- if (!MediaUtils.hasCodecForResourceAndDomain(getContext(), resId, "video/")
+ for (String res : resources) {
+ setDataSourceFd(res);
+ if (!MediaUtils.hasCodecForResourceAndDomain(res, "video/")
&& mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
MediaUtils.skipTest("no video codecs for resource on watch");
continue;
}
- setDataSourceFd(resId);
-
for (int i = 0; i < resolutions.length; i++) {
int width = resolutions[i][0];
int height = resolutions[i][1];
@@ -994,14 +1003,14 @@
}
public void testGetScaledFrameAtTime() {
- int resId = R.raw.binary_counter_320x240_30fps_600frames;
- if (!MediaUtils.hasCodecForResourceAndDomain(getContext(), resId, "video/")
+ String res = "binary_counter_320x240_30fps_600frames.mp4";
+ setDataSourceFd(res);
+ if (!MediaUtils.hasCodecForResourceAndDomain(res, "video/")
&& mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
MediaUtils.skipTest("no video codecs for resource on watch");
return;
}
- setDataSourceFd(resId);
MediaMetadataRetriever.BitmapParams params = new MediaMetadataRetriever.BitmapParams();
// Test desided size of 160 x 120. Return should be 160 x 120
@@ -1017,14 +1026,14 @@
testGetScaledFrameAtTime(160, 240, 160, 120, Bitmap.Config.RGB_565);
// Test scaled the video with aspect ratio
- resId = R.raw.binary_counter_320x240_720x240_30fps_600frames;
- setDataSourceFd(resId);
+ res = "binary_counter_320x240_720x240_30fps_600frames.mp4";
+ setDataSourceFd(res);
testGetScaledFrameAtTime(330, 240, 330, 110, null);
}
public void testGetImageAtIndex() throws Exception {
- testGetImage(R.raw.heifwriter_input, 1920, 1080, 0 /*rotation*/,
+ testGetImage("heifwriter_input.heic", 1920, 1080, 0 /*rotation*/,
4 /*imageCount*/, 3 /*primary*/, true /*useGrid*/, true /*checkColor*/);
}
@@ -1051,7 +1060,7 @@
}
private void testGetImage(
- int resId, int width, int height, int rotation,
+ final String res, int width, int height, int rotation,
int imageCount, int primary, boolean useGrid, boolean checkColor)
throws Exception {
Stopwatch timer = new Stopwatch();
@@ -1060,12 +1069,12 @@
InputStream inputStream = null;
try {
- setDataSourceFd(resId);
+ setDataSourceFd(res);
// Verify image related meta keys.
String hasImage = mRetriever.extractMetadata(
MediaMetadataRetriever.METADATA_KEY_HAS_IMAGE);
- assertTrue("No images found in resId " + resId, "yes".equals(hasImage));
+ assertTrue("No images found in res " + res, "yes".equals(hasImage));
assertEquals("Wrong width", width,
Integer.parseInt(mRetriever.extractMetadata(
MediaMetadataRetriever.METADATA_KEY_IMAGE_WIDTH)));
@@ -1123,7 +1132,7 @@
// Check the color block position on the bitmap decoded by BitmapFactory.
// This should match the primary image as well.
- inputStream = getContext().getResources().openRawResource(resId);
+ inputStream = new FileInputStream(mInpPrefix + res);
bitmap = BitmapFactory.decodeStream(inputStream);
assertTrue("Color block for bitmap decoding doesn't match",
approxEquals(COLOR_BLOCK, Color.valueOf(
@@ -1134,8 +1143,7 @@
// Check the grid configuration related keys.
if (useGrid) {
extractor = new MediaExtractor();
- Resources resources = getContext().getResources();
- afd = resources.openRawResourceFd(resId);
+ afd = getAssetFileDescriptorFor(res);
extractor.setDataSource(
afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
MediaFormat format = extractor.getTrackFormat(0);
@@ -1163,13 +1171,13 @@
}
}
- private void copyMeidaFile() {
+ private void copyMediaFile() {
InputStream inputStream = null;
FileOutputStream outputStream = null;
String outputPath = new File(
Environment.getExternalStorageDirectory(), TEST_MEDIA_FILE).getAbsolutePath();
try {
- inputStream = getContext().getResources().openRawResource(R.raw.testvideo);
+ inputStream = new FileInputStream(mInpPrefix + "testvideo.3gp");
outputStream = new FileOutputStream(outputPath);
copy(inputStream, outputStream);
} catch (Exception e) {
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index a68dfcb..656cd85 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -36,11 +36,11 @@
import android.media.TimedText;
import android.media.audiofx.AudioEffect;
import android.media.audiofx.Visualizer;
-import android.media.cts.R;
import android.media.cts.TestUtils.Monitor;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
+import android.os.ParcelFileDescriptor;
import android.os.PowerManager;
import android.os.SystemClock;
import android.platform.test.annotations.AppModeFull;
@@ -57,6 +57,8 @@
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
@@ -87,6 +89,8 @@
private String RECORDED_FILE;
private static final String LOG_TAG = "MediaPlayerTest";
+ static final String mInpPrefix = WorkDir.getMediaDirString();
+
private static final int RECORDED_VIDEO_WIDTH = 176;
private static final int RECORDED_VIDEO_HEIGHT = 144;
private static final long RECORDED_DURATION_MS = 3000;
@@ -124,10 +128,18 @@
@Presubmit
public void testFlacHeapOverflow() throws Exception {
- testIfMediaServerDied(R.raw.heap_oob_flac);
+ testIfMediaServerDied("heap_oob_flac.mp3");
}
- private void testIfMediaServerDied(int res) throws Exception {
+ protected static AssetFileDescriptor getAssetFileDescriptorFor(final String res)
+ throws FileNotFoundException {
+ File inpFile = new File(mInpPrefix + res);
+ ParcelFileDescriptor parcelFD =
+ ParcelFileDescriptor.open(inpFile, ParcelFileDescriptor.MODE_READ_ONLY);
+ return new AssetFileDescriptor(parcelFD, 0, parcelFD.getStatSize());
+ }
+
+ private void testIfMediaServerDied(final String res) throws Exception {
mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
@Override
public boolean onError(MediaPlayer mp, int what, int extra) {
@@ -146,7 +158,7 @@
}
});
- AssetFileDescriptor afd = mResources.openRawResourceFd(res);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
mMediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
try {
@@ -166,7 +178,7 @@
public void testVorbisCrash() throws Exception {
MediaPlayer mp = mMediaPlayer;
MediaPlayer mp2 = mMediaPlayer2;
- AssetFileDescriptor afd2 = mResources.openRawResourceFd(R.raw.testmp3_2);
+ AssetFileDescriptor afd2 = getAssetFileDescriptorFor("testmp3_2.mp3");
mp2.setDataSource(afd2.getFileDescriptor(), afd2.getStartOffset(), afd2.getLength());
afd2.close();
mp2.prepare();
@@ -175,7 +187,7 @@
for (int i = 0; i < 20; i++) {
try {
- AssetFileDescriptor afd = mResources.openRawResourceFd(R.raw.bug13652927);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor("bug13652927.ogg");
mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
mp.prepare();
@@ -206,9 +218,9 @@
final int seekDuration = 100;
// This is "R.raw.testmp3_2", base64-encoded.
- final int resid = R.raw.testmp3_3;
+ final String res = "testmp3_3.raw";
- InputStream is = mContext.getResources().openRawResource(resid);
+ InputStream is = new FileInputStream(mInpPrefix + res);
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
StringBuilder builder = new StringBuilder();
@@ -264,24 +276,23 @@
}
public void testPlayAudioMp3() throws Exception {
- testPlayAudio(R.raw.testmp3_2,
+ testPlayAudio("testmp3_2.mp3",
34909 /* duration */, 70 /* tolerance */, 100 /* seekDuration */);
}
public void testPlayAudioOpus() throws Exception {
- testPlayAudio(R.raw.testopus,
+ testPlayAudio("testopus.opus",
34909 /* duration */, 70 /* tolerance */, 100 /* seekDuration */);
}
public void testPlayAudioAmr() throws Exception {
- testPlayAudio(R.raw.testamr,
+ testPlayAudio("testamr.amr",
34909 /* duration */, 70 /* tolerance */, 100 /* seekDuration */);
}
- public void testPlayAudio(int resid,
+ public void testPlayAudio(final String res,
int mp3Duration, int tolerance, int seekDuration) throws Exception {
-
- MediaPlayer mp = MediaPlayer.create(mContext, resid);
+ MediaPlayer mp = MediaPlayer.create(mContext, Uri.fromFile(new File(mInpPrefix + res)));
try {
mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
@@ -312,7 +323,7 @@
// test stop and restart
mp.stop();
mp.reset();
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
mp.prepare();
@@ -330,10 +341,11 @@
}
public void testConcurentPlayAudio() throws Exception {
- final int resid = R.raw.test1m1s; // MP3 longer than 1m are usualy offloaded
+ final String res = "test1m1s.mp3"; // MP3 longer than 1m are usualy offloaded
final int tolerance = 70;
- List<MediaPlayer> mps = Stream.generate(() -> MediaPlayer.create(mContext, resid))
+ List<MediaPlayer> mps = Stream.generate(
+ () -> MediaPlayer.create(mContext, Uri.fromFile(new File(mInpPrefix + res))))
.limit(5).collect(Collectors.toList());
try {
@@ -366,9 +378,9 @@
}
public void testPlayAudioLooping() throws Exception {
- final int resid = R.raw.testmp3;
+ final String res = "testmp3.mp3";
- MediaPlayer mp = MediaPlayer.create(mContext, resid);
+ MediaPlayer mp = MediaPlayer.create(mContext, Uri.fromFile(new File(mInpPrefix + res)));
try {
mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
@@ -403,18 +415,18 @@
}
public void testPlayMidi() throws Exception {
- runMidiTest(R.raw.midi8sec, 8000 /* duration */);
- runMidiTest(R.raw.testrtttl, 30000 /* duration */);
- runMidiTest(R.raw.testimy, 5625 /* duration */);
- runMidiTest(R.raw.testota, 5906 /* duration */);
- runMidiTest(R.raw.testmxmf, 29095 /* duration */);
+ runMidiTest("midi8sec.mid", 8000 /* duration */);
+ runMidiTest("testrtttl.rtttl", 30000 /* duration */);
+ runMidiTest("testimy.imy", 5625 /* duration */);
+ runMidiTest("testota.ota", 5906 /* duration */);
+ runMidiTest("testmxmf.mxmf", 29095 /* duration */);
}
- private void runMidiTest(int resid, int midiDuration) throws Exception {
+ private void runMidiTest(final String res, int midiDuration) throws Exception {
final int tolerance = 70;
final int seekDuration = 1000;
- MediaPlayer mp = MediaPlayer.create(mContext, resid);
+ MediaPlayer mp = MediaPlayer.create(mContext, Uri.fromFile(new File(mInpPrefix + res)));
try {
mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
@@ -436,7 +448,7 @@
// test stop and restart
mp.stop();
mp.reset();
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
mp.prepare();
@@ -576,9 +588,9 @@
public void testPlayAudioTwice() throws Exception {
- final int resid = R.raw.camera_click;
+ final String res = "camera_click.ogg";
- MediaPlayer mp = MediaPlayer.create(mContext, resid);
+ MediaPlayer mp = MediaPlayer.create(mContext, Uri.fromFile(new File(mInpPrefix + res)));
try {
mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
@@ -604,11 +616,11 @@
}
public void testPlayVideo() throws Exception {
- playVideoTest(R.raw.testvideo, 352, 288);
+ playLoadedVideoTest("testvideo.3gp", 352, 288);
}
private void initMediaPlayer(MediaPlayer player) throws Exception {
- AssetFileDescriptor afd = mResources.openRawResourceFd(R.raw.test1m1s);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor("test1m1s.mp3");
try {
player.reset();
player.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
@@ -788,7 +800,7 @@
// will also result in zeroes being detected.
// Note that this test does NOT guarantee that the correct data is played
public void testGapless1() throws Exception {
- flakyTestWrapper(R.raw.monodcpos, R.raw.monodcneg);
+ flakyTestWrapper("monodcpos.mp3", "monodcneg.mp3");
}
// This test is similar, but uses two identical m4a files that have some noise
@@ -796,21 +808,21 @@
// a gap in playback
// Note that this test does NOT guarantee that the correct data is played
public void testGapless2() throws Exception {
- flakyTestWrapper(R.raw.stereonoisedcpos, R.raw.stereonoisedcpos);
+ flakyTestWrapper("stereonoisedcpos.m4a", "stereonoisedcpos.m4a");
}
// same as above, but with a mono file
public void testGapless3() throws Exception {
- flakyTestWrapper(R.raw.mononoisedcpos, R.raw.mononoisedcpos);
+ flakyTestWrapper("mononoisedcpos.m4a", "mononoisedcpos.m4a");
}
- private void flakyTestWrapper(int resid1, int resid2) throws Exception {
+ private void flakyTestWrapper(final String res1, final String res2) throws Exception {
boolean success = false;
// test usually succeeds within a few tries, but occasionally may fail
// many times in a row, so be aggressive and try up to 20 times
for (int i = 0; i < 20 && !success; i++) {
try {
- testGapless(resid1, resid2);
+ testGapless(res1, res2);
success = true;
} catch (Throwable t) {
SystemClock.sleep(1000);
@@ -819,11 +831,11 @@
// Try one more time. If this succeeds, we'll consider the test a success,
// otherwise the exception gets thrown
if (!success) {
- testGapless(resid1, resid2);
+ testGapless(res1, res2);
}
}
- private void testGapless(int resid1, int resid2) throws Exception {
+ private void testGapless(final String res1, final String res2) throws Exception {
MediaPlayer mp1 = null;
MediaPlayer mp2 = null;
AudioEffect vc = null;
@@ -840,7 +852,7 @@
mp1 = new MediaPlayer();
mp1.setAudioStreamType(AudioManager.STREAM_MUSIC);
- AssetFileDescriptor afd = mContext.getResources().openRawResourceFd(resid1);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res1);
mp1.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
mp1.prepare();
@@ -851,7 +863,7 @@
mp2.setAudioSessionId(session);
mp2.setAudioStreamType(AudioManager.STREAM_MUSIC);
- afd = mContext.getResources().openRawResourceFd(resid2);
+ afd = getAssetFileDescriptorFor(res2);
mp2.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
mp2.prepare();
@@ -960,7 +972,7 @@
}
});
- if (!checkLoadResource(R.raw.testvideo)) {
+ if (!checkLoadResource("testvideo.3gp")) {
return; // skip;
}
playLoadedVideo(352, 288, -1);
@@ -1126,7 +1138,7 @@
// setPlaybackParams() with non-zero speed should start playback.
public void testSetPlaybackParamsPositiveSpeed() throws Exception {
if (!checkLoadResource(
- R.raw.video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz)) {
+ "video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4")) {
return; // skip
}
@@ -1182,7 +1194,7 @@
// setPlaybackParams() with zero speed should pause playback.
public void testSetPlaybackParamsZeroSpeed() throws Exception {
if (!checkLoadResource(
- R.raw.video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz)) {
+ "video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4")) {
return; // skip
}
@@ -1225,7 +1237,7 @@
public void testPlaybackRate() throws Exception {
final int toleranceMs = 1000;
if (!checkLoadResource(
- R.raw.video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz)) {
+ "video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4")) {
return; // skip
}
@@ -1266,7 +1278,7 @@
public void testSeekModes() throws Exception {
// This clip has 2 I frames at 66687us and 4299687us.
if (!checkLoadResource(
- R.raw.bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz)) {
+ "bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz.mp4")) {
return; // skip
}
@@ -1341,7 +1353,7 @@
final int toleranceUs = 100000;
final float playbackRate = 1.0f;
if (!checkLoadResource(
- R.raw.video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz)) {
+ "video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4")) {
return; // skip
}
@@ -1385,7 +1397,7 @@
public void testMediaTimeDiscontinuity() throws Exception {
if (!checkLoadResource(
- R.raw.bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz)) {
+ "bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz.mp4")) {
return; // skip
}
@@ -1450,220 +1462,220 @@
public void testLocalVideo_MKV_H265_1280x720_500kbps_25fps_AAC_Stereo_128kbps_44100Hz()
throws Exception {
- playVideoTest(
- R.raw.video_1280x720_mkv_h265_500kbps_25fps_aac_stereo_128kbps_44100hz, 1280, 720);
+ playLoadedVideoTest("video_1280x720_mkv_h265_500kbps_25fps_aac_stereo_128kbps_44100hz.mkv",
+ 1280, 720);
}
public void testLocalVideo_MP4_H264_480x360_500kbps_25fps_AAC_Stereo_128kbps_44110Hz()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz, 480, 360);
+ playLoadedVideoTest("video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
+ 480, 360);
}
public void testLocalVideo_MP4_H264_480x360_500kbps_30fps_AAC_Stereo_128kbps_44110Hz()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz, 480, 360);
+ playLoadedVideoTest("video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz.mp4",
+ 480, 360);
}
public void testLocalVideo_MP4_H264_480x360_1000kbps_25fps_AAC_Stereo_128kbps_44110Hz()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz, 480, 360);
+ playLoadedVideoTest("video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
+ 480, 360);
}
public void testLocalVideo_MP4_H264_480x360_1000kbps_30fps_AAC_Stereo_128kbps_44110Hz()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz, 480, 360);
+ playLoadedVideoTest("video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4",
+ 480, 360);
}
public void testLocalVideo_MP4_H264_480x360_1350kbps_25fps_AAC_Stereo_128kbps_44110Hz()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz, 480, 360);
+ playLoadedVideoTest("video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
+ 480, 360);
}
public void testLocalVideo_MP4_H264_480x360_1350kbps_30fps_AAC_Stereo_128kbps_44110Hz()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz, 480, 360);
+ playLoadedVideoTest("video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4",
+ 480, 360);
}
public void testLocalVideo_MP4_H264_480x360_1350kbps_30fps_AAC_Stereo_128kbps_44110Hz_frag()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_fragmented,
+ playLoadedVideoTest(
+ "video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_fragmented.mp4",
480, 360);
}
public void testLocalVideo_MP4_H264_480x360_1350kbps_30fps_AAC_Stereo_192kbps_44110Hz()
throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz, 480, 360);
+ playLoadedVideoTest("video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4",
+ 480, 360);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Mono_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Mono_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_128kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_128kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Mono_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Mono_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_128kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_128kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Mono_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Mono_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_128kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_128kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Mono_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Mono_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz.3gp", 176,
+ 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_24kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_24kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_128kbps_11025Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz.3gp",
+ 176, 144);
}
public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_128kbps_22050Hz()
throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz, 176, 144);
+ playLoadedVideoTest("video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz.3gp",
+ 176, 144);
}
public void testLocalVideo_cp1251_3_a_ms_acm_mp3() throws Exception {
- playVideoTest(R.raw.cp1251_3_a_ms_acm_mp3, -1, -1);
+ playLoadedVideoTest("cp1251_3_a_ms_acm_mp3.mkv", -1, -1);
}
public void testLocalVideo_mkv_audio_pcm_be() throws Exception {
- playVideoTest(R.raw.mkv_audio_pcms16be, -1, -1);
+ playLoadedVideoTest("mkv_audio_pcms16be.mkv", -1, -1);
}
public void testLocalVideo_mkv_audio_pcm_le() throws Exception {
- playVideoTest(R.raw.mkv_audio_pcms16le, -1, -1);
+ playLoadedVideoTest("mkv_audio_pcms16le.mkv", -1, -1);
}
public void testLocalVideo_segment000001_m2ts()
throws Exception {
- if (checkLoadResource(R.raw.segment000001)) {
+ if (checkLoadResource("segment000001.ts")) {
mMediaPlayer.stop();
- assertTrue(checkLoadResource(R.raw.segment000001_m2ts));
+ assertTrue(checkLoadResource("segment000001_m2ts.mp4"));
playLoadedVideo(320, 240, 0);
} else {
MediaUtils.skipTest("no mp2 support, skipping m2ts");
@@ -1703,7 +1715,7 @@
}
public void testDeselectTrackForSubtitleTracks() throws Throwable {
- if (!checkLoadResource(R.raw.testvideo_with_2_subtitle_tracks)) {
+ if (!checkLoadResource("testvideo_with_2_subtitle_tracks.mp4")) {
return; // skip;
}
@@ -1769,7 +1781,7 @@
}
public void testChangeSubtitleTrack() throws Throwable {
- if (!checkLoadResource(R.raw.testvideo_with_2_subtitle_tracks)) {
+ if (!checkLoadResource("testvideo_with_2_subtitle_tracks.mp4")) {
return; // skip;
}
@@ -1820,7 +1832,7 @@
}
public void testOnSubtitleDataListener() throws Throwable {
- if (!checkLoadResource(R.raw.testvideo_with_2_subtitle_tracks)) {
+ if (!checkLoadResource("testvideo_with_2_subtitle_tracks.mp4")) {
return; // skip;
}
@@ -1877,7 +1889,7 @@
@Presubmit
public void testGetTrackInfoForVideoWithSubtitleTracks() throws Throwable {
- if (!checkLoadResource(R.raw.testvideo_with_2_subtitle_tracks)) {
+ if (!checkLoadResource("testvideo_with_2_subtitle_tracks.mp4")) {
return; // skip;
}
@@ -1958,13 +1970,13 @@
}
public void testDeselectTrackForTimedTextTrack() throws Throwable {
- if (!checkLoadResource(R.raw.testvideo_with_2_timedtext_tracks)) {
+ if (!checkLoadResource("testvideo_with_2_timedtext_tracks.3gp")) {
return; // skip;
}
runTestOnUiThread(new Runnable() {
public void run() {
try {
- loadSubtitleSource(R.raw.test_subtitle1_srt);
+ loadSubtitleSource("test_subtitle1_srt.3gp");
} catch (Exception e) {
throw new AssertionFailedError(e.getMessage());
}
@@ -2039,8 +2051,8 @@
}
private void testChangeTimedTextTrackWithSpeed(float speed) throws Throwable {
- testTimedText(R.raw.testvideo_with_2_timedtext_tracks, 2,
- new int[] {R.raw.test_subtitle1_srt, R.raw.test_subtitle2_srt},
+ testTimedText("testvideo_with_2_timedtext_tracks.3gp", 2,
+ new String[] {"test_subtitle1_srt.3gp", "test_subtitle2_srt.3gp"},
new VerifyAndSignalTimedText(),
new Callable<Void>() {
@Override
@@ -2089,7 +2101,7 @@
} catch (Exception e) {
Log.w(LOG_TAG, "bad num/iteration arguments, using default", e);
}
- testTimedText(R.raw.testvideo_with_2_timedtext_tracks, 2, new int[] {},
+ testTimedText("testvideo_with_2_timedtext_tracks.3gp", 2, new String [] {},
new VerifyAndSignalTimedText(num.get(), true),
new Callable<Void>() {
@Override
@@ -2121,7 +2133,7 @@
}
private void testTimedText(
- int resource, int numInternalTracks, int[] subtitleResources,
+ String resource, int numInternalTracks, String[] subtitleResources,
OnTimedTextListener onTimedTextListener, Callable<?> testBody) throws Throwable {
if (!checkLoadResource(resource)) {
return; // skip;
@@ -2151,7 +2163,7 @@
public void run() {
try {
// Adds two more external subtitle files.
- for (int subRes : subtitleResources) {
+ for (String subRes : subtitleResources) {
loadSubtitleSource(subRes);
}
readTimedTextTracks();
@@ -2168,14 +2180,14 @@
@Presubmit
public void testGetTrackInfoForVideoWithTimedText() throws Throwable {
- if (!checkLoadResource(R.raw.testvideo_with_2_timedtext_tracks)) {
+ if (!checkLoadResource("testvideo_with_2_timedtext_tracks.3gp")) {
return; // skip;
}
runTestOnUiThread(new Runnable() {
public void run() {
try {
- loadSubtitleSource(R.raw.test_subtitle1_srt);
- loadSubtitleSource(R.raw.test_subtitle2_srt);
+ loadSubtitleSource("test_subtitle1_srt.3gp");
+ loadSubtitleSource("test_subtitle2_srt.3gp");
} catch (Exception e) {
throw new AssertionFailedError(e.getMessage());
}
@@ -2213,23 +2225,21 @@
*/
public void testResumeAtEnd() throws Throwable {
int testsRun =
- testResumeAtEnd(R.raw.loudsoftmp3) +
- testResumeAtEnd(R.raw.loudsoftwav) +
- testResumeAtEnd(R.raw.loudsoftogg) +
- testResumeAtEnd(R.raw.loudsoftitunes) +
- testResumeAtEnd(R.raw.loudsoftfaac) +
- testResumeAtEnd(R.raw.loudsoftaac);
+ testResumeAtEnd("loudsoftmp3.mp3") +
+ testResumeAtEnd("loudsoftwav.wav") +
+ testResumeAtEnd("loudsoftogg.ogg") +
+ testResumeAtEnd("loudsoftitunes.m4a") +
+ testResumeAtEnd("loudsoftfaac.m4a") +
+ testResumeAtEnd("loudsoftaac.aac");
if (testsRun == 0) {
MediaUtils.skipTest("no decoder found");
}
}
// returns 1 if test was run, 0 otherwise
- private int testResumeAtEnd(int res) throws Throwable {
+ private int testResumeAtEnd(final String res) throws Throwable {
if (!loadResource(res)) {
- Log.i(LOG_TAG, "testResumeAtEnd: No decoder found for " +
- mContext.getResources().getResourceEntryName(res) +
- " --- skipping.");
+ Log.i(LOG_TAG, "testResumeAtEnd: No decoder found for " + res + " --- skipping.");
return 0; // skip
}
mMediaPlayer.prepare();
@@ -2254,23 +2264,21 @@
public void testPositionAtEnd() throws Throwable {
int testsRun =
- testPositionAtEnd(R.raw.test1m1shighstereo) +
- testPositionAtEnd(R.raw.loudsoftmp3) +
- testPositionAtEnd(R.raw.loudsoftwav) +
- testPositionAtEnd(R.raw.loudsoftogg) +
- testPositionAtEnd(R.raw.loudsoftitunes) +
- testPositionAtEnd(R.raw.loudsoftfaac) +
- testPositionAtEnd(R.raw.loudsoftaac);
+ testPositionAtEnd("test1m1shighstereo.mp3") +
+ testPositionAtEnd("loudsoftmp3.mp3") +
+ testPositionAtEnd("loudsoftwav.wav") +
+ testPositionAtEnd("loudsoftogg.ogg") +
+ testPositionAtEnd("loudsoftitunes.m4a") +
+ testPositionAtEnd("loudsoftfaac.m4a") +
+ testPositionAtEnd("loudsoftaac.aac");
if (testsRun == 0) {
MediaUtils.skipTest(LOG_TAG, "no decoder found");
}
}
- private int testPositionAtEnd(int res) throws Throwable {
+ private int testPositionAtEnd(final String res) throws Throwable {
if (!loadResource(res)) {
- Log.i(LOG_TAG, "testPositionAtEnd: No decoder found for " +
- mContext.getResources().getResourceEntryName(res) +
- " --- skipping.");
+ Log.i(LOG_TAG, "testPositionAtEnd: No decoder found for " + res + " --- skipping.");
return 0; // skip
}
mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
@@ -2299,7 +2307,7 @@
public void testCallback() throws Throwable {
final int mp4Duration = 8484;
- if (!checkLoadResource(R.raw.testvideo)) {
+ if (!checkLoadResource("testvideo.3gp")) {
return; // skip;
}
@@ -2459,15 +2467,15 @@
// Smoke test playback from a MediaDataSource.
public void testPlaybackFromAMediaDataSource() throws Exception {
- final int resid = R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
+ final String res = "video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4";
final int duration = 10000;
- if (!MediaUtils.hasCodecsForResource(mContext, resid)) {
+ if (!MediaUtils.hasCodecsForResource(mInpPrefix + res)) {
return;
}
TestMediaDataSource dataSource =
- TestMediaDataSource.fromAssetFd(mResources.openRawResourceFd(resid));
+ TestMediaDataSource.fromAssetFd(getAssetFileDescriptorFor(res));
// Test returning -1 from getSize() to indicate unknown size.
dataSource.returnFromGetSize(-1);
mMediaPlayer.setDataSource(dataSource);
@@ -2517,14 +2525,14 @@
@Presubmit
public void testPlaybackFailsIfMediaDataSourceThrows() throws Exception {
- final int resid = R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
- if (!MediaUtils.hasCodecsForResource(mContext, resid)) {
+ final String res = "video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4";
+ if (!MediaUtils.hasCodecsForResource(mInpPrefix + res)) {
return;
}
setOnErrorListener();
TestMediaDataSource dataSource =
- TestMediaDataSource.fromAssetFd(mResources.openRawResourceFd(resid));
+ TestMediaDataSource.fromAssetFd(getAssetFileDescriptorFor(res));
mMediaPlayer.setDataSource(dataSource);
mMediaPlayer.prepare();
@@ -2535,14 +2543,14 @@
@Presubmit
public void testPlaybackFailsIfMediaDataSourceReturnsAnError() throws Exception {
- final int resid = R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
- if (!MediaUtils.hasCodecsForResource(mContext, resid)) {
+ final String res = "video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4";
+ if (!MediaUtils.hasCodecsForResource(mInpPrefix + res)) {
return;
}
setOnErrorListener();
TestMediaDataSource dataSource =
- TestMediaDataSource.fromAssetFd(mResources.openRawResourceFd(resid));
+ TestMediaDataSource.fromAssetFd(getAssetFileDescriptorFor(res));
mMediaPlayer.setDataSource(dataSource);
mMediaPlayer.prepare();
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
index f01665a..fe6242f 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
@@ -18,15 +18,17 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
import android.media.MediaPlayer;
import android.media.cts.TestUtils.Monitor;
import android.net.Uri;
+import android.os.ParcelFileDescriptor;
import android.os.PersistableBundle;
import android.test.ActivityInstrumentationTestCase2;
import com.android.compatibility.common.util.MediaUtils;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.HttpCookie;
import java.util.List;
@@ -40,6 +42,8 @@
public class MediaPlayerTestBase extends ActivityInstrumentationTestCase2<MediaStubActivity> {
private static final Logger LOG = Logger.getLogger(MediaPlayerTestBase.class.getName());
+ static final String mInpPrefix = WorkDir.getMediaDirString();
+
protected static final int SLEEP_TIME = 1000;
protected static final int LONG_SLEEP_TIME = 6000;
protected static final int STREAM_RETRIES = 20;
@@ -55,8 +59,6 @@
protected Monitor mOnErrorCalled = new Monitor();
protected Context mContext;
- protected Resources mResources;
-
protected MediaPlayer mMediaPlayer = null;
protected MediaPlayer mMediaPlayer2 = null;
@@ -83,7 +85,6 @@
fail();
}
mContext = getInstrumentation().getTargetContext();
- mResources = mContext.getResources();
}
@Override
@@ -100,13 +101,21 @@
super.tearDown();
}
+ protected static AssetFileDescriptor getAssetFileDescriptorFor(final String res)
+ throws FileNotFoundException {
+ File inpFile = new File(mInpPrefix + res);
+ ParcelFileDescriptor parcelFD =
+ ParcelFileDescriptor.open(inpFile, ParcelFileDescriptor.MODE_READ_ONLY);
+ return new AssetFileDescriptor(parcelFD, 0, parcelFD.getStatSize());
+ }
+
// returns true on success
- protected boolean loadResource(int resid) throws Exception {
- if (!MediaUtils.hasCodecsForResource(mContext, resid)) {
+ protected boolean loadResource(final String res) throws Exception {
+ if (!MediaUtils.hasCodecsForResource(mInpPrefix + res)) {
return false;
}
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
try {
mMediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(),
afd.getLength());
@@ -125,12 +134,12 @@
return true;
}
- protected boolean checkLoadResource(int resid) throws Exception {
- return MediaUtils.check(loadResource(resid), "no decoder found");
+ protected boolean checkLoadResource(String res) throws Exception {
+ return MediaUtils.check(loadResource(res), "no decoder found");
}
- protected void loadSubtitleSource(int resid) throws Exception {
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ protected void loadSubtitleSource(String res) throws Exception {
+ AssetFileDescriptor afd = getAssetFileDescriptorFor(res);
try {
mMediaPlayer.addTimedTextSource(afd.getFileDescriptor(), afd.getStartOffset(),
afd.getLength(), MediaPlayer.MEDIA_MIMETYPE_TEXT_SUBRIP);
@@ -169,8 +178,8 @@
assertTrue("Stream did not play successfully after all attempts", playedSuccessfully);
}
- protected void playVideoTest(int resid, int width, int height) throws Exception {
- if (!checkLoadResource(resid)) {
+ protected void playLoadedVideoTest(final String res, int width, int height) throws Exception {
+ if (!checkLoadResource(res)) {
return; // skip
}
diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
index 56fe9c5..fba0dee 100644
--- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
@@ -53,6 +53,7 @@
public class StreamingMediaPlayerTest extends MediaPlayerTestBase {
private static final String TAG = "StreamingMediaPlayerTest";
+ static final String mInpPrefix = WorkDir.getMediaDirString() + "assets/";
private static final String HTTP_H263_AMR_VIDEO_1_KEY =
"streaming_media_player_test_http_h263_amr_video1";
@@ -284,9 +285,9 @@
if (redirect) {
// Stagefright doesn't have a limit, but we can't test support of infinite redirects
// Up to 4 redirects seems reasonable though.
- stream_url = mServer.getRedirectingAssetUrl(name, 4);
+ stream_url = mServer.getRedirectingAssetUrl(mInpPrefix + name, 4);
} else {
- stream_url = mServer.getAssetUrl(name);
+ stream_url = mServer.getAssetUrl(mInpPrefix + name);
}
if (nolength) {
stream_url = stream_url + "?" + CtsTestServer.NOLENGTH_POSTFIX;
@@ -342,9 +343,9 @@
if (redirect) {
// Stagefright doesn't have a limit, but we can't test support of infinite redirects
// Up to 4 redirects seems reasonable though.
- stream_url = mServer.getRedirectingAssetUrl(name, 4);
+ stream_url = mServer.getRedirectingAssetUrl(mInpPrefix + name, 4);
} else {
- stream_url = mServer.getAssetUrl(name);
+ stream_url = mServer.getAssetUrl(mInpPrefix + name);
}
if (nolength) {
stream_url = stream_url + "?" + CtsTestServer.NOLENGTH_POSTFIX;
@@ -414,7 +415,7 @@
// counter must be final if we want to access it inside onTimedMetaData;
// use AtomicInteger so we can have a final counter object with mutable integer value.
final AtomicInteger counter = new AtomicInteger();
- String stream_url = mServer.getAssetUrl("prog_index.m3u8");
+ String stream_url = mServer.getAssetUrl(mInpPrefix + "prog_index.m3u8");
mMediaPlayer.setDataSource(stream_url);
mMediaPlayer.setDisplay(getActivity().getSurfaceHolder());
mMediaPlayer.setScreenOnWhilePlaying(true);
@@ -549,7 +550,7 @@
final MediaPlayer mp = worker.getPlayer();
try {
- String path = mServer.getDelayedAssetUrl("noiseandchirps.ogg", 15000);
+ String path = mServer.getDelayedAssetUrl(mInpPrefix + "noiseandchirps.ogg", 15000);
mp.setDataSource(path);
mp.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
@@ -609,9 +610,9 @@
try {
String stream_url = null;
if (redirect) {
- stream_url = mServer.getQueryRedirectingAssetUrl(name);
+ stream_url = mServer.getQueryRedirectingAssetUrl(mInpPrefix + name);
} else {
- stream_url = mServer.getAssetUrl(name);
+ stream_url = mServer.getAssetUrl(mInpPrefix + name);
}
if (appendQueryString) {
stream_url += "?foo=bar/baz";
diff --git a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
index a545b09..ca0181f 100644
--- a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
@@ -16,11 +16,7 @@
package android.media.cts;
-import android.media.cts.R;
-
import android.content.Context;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
import android.media.MediaCodec;
import android.media.MediaCodecInfo.VideoCapabilities;
import android.media.MediaExtractor;
@@ -76,13 +72,12 @@
private MediaFormat mDecOutputFormat;
private int mBitrate;
- private Resources mResources;
private boolean mSkipRateChecking = false;
+ static final String mInpPrefix = WorkDir.getMediaDirString();
@Override
protected void setUp() throws Exception {
super.setUp();
- mResources = mContext.getResources();
Bundle bundle = InstrumentationRegistry.getArguments();
mSkipRateChecking = TextUtils.equals("true", bundle.getString("mts-media"));
}
@@ -123,7 +118,7 @@
return line;
}
- private void decode(String name, int resourceId, MediaFormat format) throws Exception {
+ private void decode(String name, final String resource, MediaFormat format) throws Exception {
int width = format.getInteger(MediaFormat.KEY_WIDTH);
int height = format.getInteger(MediaFormat.KEY_HEIGHT);
String mime = format.getString(MediaFormat.KEY_MIME);
@@ -142,7 +137,7 @@
Log.d(TAG, "round #" + i + ": " + name + " for " + maxTimeMs + " msecs to surface");
Surface s = getActivity().getSurfaceHolder().getSurface();
// only verify the result for decode to surface case.
- measuredFps[i] = doDecode(name, resourceId, width, height, s, i, maxTimeMs);
+ measuredFps[i] = doDecode(name, resource, width, height, s, i, maxTimeMs);
// We don't test decoding to buffer.
// Log.d(TAG, "round #" + i + " decode to buffer");
@@ -160,13 +155,11 @@
mSamplesInMemory.clear();
}
- private double doDecode(
- String name, int video, int w, int h, Surface surface, int round, long maxTimeMs)
- throws Exception {
- AssetFileDescriptor testFd = mResources.openRawResourceFd(video);
+ private double doDecode(String name, final String filename, int w, int h, Surface surface,
+ int round, long maxTimeMs) throws Exception {
+ final String video = mInpPrefix + filename;
MediaExtractor extractor = new MediaExtractor();
- extractor.setDataSource(testFd.getFileDescriptor(), testFd.getStartOffset(),
- testFd.getLength());
+ extractor.setDataSource(video);
extractor.selectTrack(0);
int trackIndex = extractor.getSampleTrackIndex();
MediaFormat format = extractor.getTrackFormat(trackIndex);
@@ -220,7 +213,6 @@
int sampleIndex = 0;
extractor.release();
- testFd.close();
MediaCodec codec = MediaCodec.createByCodecName(name);
VideoCapabilities cap = codec.getCodecInfo().getCapabilitiesForType(mime).getVideoCapabilities();
@@ -335,21 +327,21 @@
return fps;
}
- private MediaFormat[] getVideoTrackFormats(int... resources) throws Exception {
+ private MediaFormat[] getVideoTrackFormats(String... resources) throws Exception {
MediaFormat[] formats = new MediaFormat[resources.length];
for (int i = 0; i < resources.length; ++i) {
- formats[i] = MediaUtils.getTrackFormatForResource(mContext, resources[i], "video/");
+ formats[i] = MediaUtils.getTrackFormatForResource(mInpPrefix + resources[i], "video/");
}
return formats;
}
- private void count(int[] resources, int numGoog, int numOther) throws Exception {
+ private void count(final String[] resources, int numGoog, int numOther) throws Exception {
MediaFormat[] formats = getVideoTrackFormats(resources);
MediaUtils.verifyNumCodecs(numGoog, false /* isEncoder */, true /* isGoog */, formats);
MediaUtils.verifyNumCodecs(numOther, false /* isEncoder */, false /* isGoog */, formats);
}
- private void perf(int[] resources, boolean isGoog, int ix) throws Exception {
+ private void perf(final String[] resources, boolean isGoog, int ix) throws Exception {
MediaFormat[] formats = getVideoTrackFormats(resources);
String[] decoders = MediaUtils.getDecoderNames(isGoog, formats);
String kind = isGoog ? "Google" : "non-Google";
@@ -379,8 +371,8 @@
// AVC tests
- private static final int[] sAvcMedia0320x0240 = {
- R.raw.bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz,
+ private static final String[] sAvcMedia0320x0240 = {
+ "bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz.mp4",
};
public void testAvcCount0320x0240() throws Exception { count(sAvcMedia0320x0240, 2, 4); }
@@ -391,8 +383,8 @@
public void testAvcOther2Perf0320x0240() throws Exception { perf(sAvcMedia0320x0240, OTHER, 2); }
public void testAvcOther3Perf0320x0240() throws Exception { perf(sAvcMedia0320x0240, OTHER, 3); }
- private static final int[] sAvcMedia0720x0480 = {
- R.raw.bbb_s1_720x480_mp4_h264_mp3_2mbps_30fps_aac_lc_5ch_320kbps_48000hz,
+ private static final String[] sAvcMedia0720x0480 = {
+ "bbb_s1_720x480_mp4_h264_mp3_2mbps_30fps_aac_lc_5ch_320kbps_48000hz.mp4",
};
public void testAvcCount0720x0480() throws Exception { count(sAvcMedia0720x0480, 2, 4); }
@@ -404,10 +396,10 @@
public void testAvcOther3Perf0720x0480() throws Exception { perf(sAvcMedia0720x0480, OTHER, 3); }
// prefer highest effective bitrate, then high profile
- private static final int[] sAvcMedia1280x0720 = {
- R.raw.bbb_s4_1280x720_mp4_h264_mp31_8mbps_30fps_aac_he_mono_40kbps_44100hz,
- R.raw.bbb_s3_1280x720_mp4_h264_hp32_8mbps_60fps_aac_he_v2_stereo_48kbps_48000hz,
- R.raw.bbb_s3_1280x720_mp4_h264_mp32_8mbps_60fps_aac_he_v2_6ch_144kbps_44100hz,
+ private static final String[] sAvcMedia1280x0720 = {
+ "bbb_s4_1280x720_mp4_h264_mp31_8mbps_30fps_aac_he_mono_40kbps_44100hz.mp4",
+ "bbb_s3_1280x720_mp4_h264_hp32_8mbps_60fps_aac_he_v2_stereo_48kbps_48000hz.mp4",
+ "bbb_s3_1280x720_mp4_h264_mp32_8mbps_60fps_aac_he_v2_6ch_144kbps_44100hz.mp4",
};
public void testAvcCount1280x0720() throws Exception { count(sAvcMedia1280x0720, 2, 4); }
@@ -419,11 +411,11 @@
public void testAvcOther3Perf1280x0720() throws Exception { perf(sAvcMedia1280x0720, OTHER, 3); }
// prefer highest effective bitrate, then high profile
- private static final int[] sAvcMedia1920x1080 = {
- R.raw.bbb_s4_1920x1080_wide_mp4_h264_hp4_20mbps_30fps_aac_lc_6ch_384kbps_44100hz,
- R.raw.bbb_s4_1920x1080_wide_mp4_h264_mp4_20mbps_30fps_aac_he_5ch_200kbps_44100hz,
- R.raw.bbb_s2_1920x1080_mp4_h264_hp42_20mbps_60fps_aac_lc_6ch_384kbps_48000hz,
- R.raw.bbb_s2_1920x1080_mp4_h264_mp42_20mbps_60fps_aac_he_v2_5ch_160kbps_48000hz,
+ private static final String[] sAvcMedia1920x1080 = {
+ "bbb_s4_1920x1080_wide_mp4_h264_hp4_20mbps_30fps_aac_lc_6ch_384kbps_44100hz.mp4",
+ "bbb_s4_1920x1080_wide_mp4_h264_mp4_20mbps_30fps_aac_he_5ch_200kbps_44100hz.mp4",
+ "bbb_s2_1920x1080_mp4_h264_hp42_20mbps_60fps_aac_lc_6ch_384kbps_48000hz.mp4",
+ "bbb_s2_1920x1080_mp4_h264_mp42_20mbps_60fps_aac_he_v2_5ch_160kbps_48000hz.mp4",
};
public void testAvcCount1920x1080() throws Exception { count(sAvcMedia1920x1080, 2, 4); }
@@ -436,8 +428,8 @@
// H263 tests
- private static final int[] sH263Media0176x0144 = {
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz,
+ private static final String[] sH263Media0176x0144 = {
+ "video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp",
};
public void testH263Count0176x0144() throws Exception { count(sH263Media0176x0144, 2, 2); }
@@ -446,8 +438,8 @@
public void testH263Other0Perf0176x0144() throws Exception { perf(sH263Media0176x0144, OTHER, 0); }
public void testH263Other1Perf0176x0144() throws Exception { perf(sH263Media0176x0144, OTHER, 1); }
- private static final int[] sH263Media0352x0288 = {
- R.raw.video_352x288_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz,
+ private static final String[] sH263Media0352x0288 = {
+ "video_352x288_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp",
};
public void testH263Count0352x0288() throws Exception { count(sH263Media0352x0288, 2, 2); }
@@ -462,8 +454,8 @@
// HEVC tests
- private static final int[] sHevcMedia0352x0288 = {
- R.raw.bbb_s1_352x288_mp4_hevc_mp2_600kbps_30fps_aac_he_stereo_96kbps_48000hz,
+ private static final String[] sHevcMedia0352x0288 = {
+ "bbb_s1_352x288_mp4_hevc_mp2_600kbps_30fps_aac_he_stereo_96kbps_48000hz.mp4",
};
public void testHevcCount0352x0288() throws Exception { count(sHevcMedia0352x0288, 2, 4); }
@@ -474,8 +466,8 @@
public void testHevcOther2Perf0352x0288() throws Exception { perf(sHevcMedia0352x0288, OTHER, 2); }
public void testHevcOther3Perf0352x0288() throws Exception { perf(sHevcMedia0352x0288, OTHER, 3); }
- private static final int[] sHevcMedia0640x0360 = {
- R.raw.bbb_s1_640x360_mp4_hevc_mp21_1600kbps_30fps_aac_he_6ch_288kbps_44100hz,
+ private static final String[] sHevcMedia0640x0360 = {
+ "bbb_s1_640x360_mp4_hevc_mp21_1600kbps_30fps_aac_he_6ch_288kbps_44100hz.mp4",
};
public void testHevcCount0640x0360() throws Exception { count(sHevcMedia0640x0360, 2, 4); }
@@ -486,8 +478,8 @@
public void testHevcOther2Perf0640x0360() throws Exception { perf(sHevcMedia0640x0360, OTHER, 2); }
public void testHevcOther3Perf0640x0360() throws Exception { perf(sHevcMedia0640x0360, OTHER, 3); }
- private static final int[] sHevcMedia0720x0480 = {
- R.raw.bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz,
+ private static final String[] sHevcMedia0720x0480 = {
+ "bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz.mp4",
};
public void testHevcCount0720x0480() throws Exception { count(sHevcMedia0720x0480, 2, 4); }
@@ -498,8 +490,8 @@
public void testHevcOther2Perf0720x0480() throws Exception { perf(sHevcMedia0720x0480, OTHER, 2); }
public void testHevcOther3Perf0720x0480() throws Exception { perf(sHevcMedia0720x0480, OTHER, 3); }
- private static final int[] sHevcMedia1280x0720 = {
- R.raw.bbb_s4_1280x720_mp4_hevc_mp31_4mbps_30fps_aac_he_stereo_80kbps_32000hz,
+ private static final String[] sHevcMedia1280x0720 = {
+ "bbb_s4_1280x720_mp4_hevc_mp31_4mbps_30fps_aac_he_stereo_80kbps_32000hz.mp4",
};
public void testHevcCount1280x0720() throws Exception { count(sHevcMedia1280x0720, 2, 4); }
@@ -510,8 +502,8 @@
public void testHevcOther2Perf1280x0720() throws Exception { perf(sHevcMedia1280x0720, OTHER, 2); }
public void testHevcOther3Perf1280x0720() throws Exception { perf(sHevcMedia1280x0720, OTHER, 3); }
- private static final int[] sHevcMedia1920x1080 = {
- R.raw.bbb_s2_1920x1080_mp4_hevc_mp41_10mbps_60fps_aac_lc_6ch_384kbps_22050hz,
+ private static final String[] sHevcMedia1920x1080 = {
+ "bbb_s2_1920x1080_mp4_hevc_mp41_10mbps_60fps_aac_lc_6ch_384kbps_22050hz.mp4",
};
public void testHevcCount1920x1080() throws Exception { count(sHevcMedia1920x1080, 2, 4); }
@@ -523,9 +515,9 @@
public void testHevcOther3Perf1920x1080() throws Exception { perf(sHevcMedia1920x1080, OTHER, 3); }
// prefer highest effective bitrate
- private static final int[] sHevcMedia3840x2160 = {
- R.raw.bbb_s4_3840x2160_mp4_hevc_mp5_20mbps_30fps_aac_lc_6ch_384kbps_24000hz,
- R.raw.bbb_s2_3840x2160_mp4_hevc_mp51_20mbps_60fps_aac_lc_6ch_384kbps_32000hz,
+ private static final String[] sHevcMedia3840x2160 = {
+ "bbb_s4_3840x2160_mp4_hevc_mp5_20mbps_30fps_aac_lc_6ch_384kbps_24000hz.mp4",
+ "bbb_s2_3840x2160_mp4_hevc_mp51_20mbps_60fps_aac_lc_6ch_384kbps_32000hz.mp4",
};
public void testHevcCount3840x2160() throws Exception { count(sHevcMedia3840x2160, 2, 4); }
@@ -550,8 +542,8 @@
// MPEG4 tests
- private static final int[] sMpeg4Media0176x0144 = {
- R.raw.video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz,
+ private static final String[] sMpeg4Media0176x0144 = {
+ "video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
};
public void testMpeg4Count0176x0144() throws Exception { count(sMpeg4Media0176x0144, 2, 4); }
@@ -562,8 +554,8 @@
public void testMpeg4Other2Perf0176x0144() throws Exception { perf(sMpeg4Media0176x0144, OTHER, 2); }
public void testMpeg4Other3Perf0176x0144() throws Exception { perf(sMpeg4Media0176x0144, OTHER, 3); }
- private static final int[] sMpeg4Media0480x0360 = {
- R.raw.video_480x360_mp4_mpeg4_860kbps_25fps_aac_stereo_128kbps_44100hz,
+ private static final String[] sMpeg4Media0480x0360 = {
+ "video_480x360_mp4_mpeg4_860kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
};
public void testMpeg4Count0480x0360() throws Exception { count(sMpeg4Media0480x0360, 2, 4); }
@@ -576,8 +568,8 @@
// No media for MPEG4 640x480
- private static final int[] sMpeg4Media1280x0720 = {
- R.raw.video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz,
+ private static final String[] sMpeg4Media1280x0720 = {
+ "video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4",
};
public void testMpeg4Count1280x0720() throws Exception { count(sMpeg4Media1280x0720, 2, 4); }
@@ -590,8 +582,8 @@
// VP8 tests
- private static final int[] sVp8Media0320x0180 = {
- R.raw.bbb_s1_320x180_webm_vp8_800kbps_30fps_opus_5ch_320kbps_48000hz,
+ private static final String[] sVp8Media0320x0180 = {
+ "bbb_s1_320x180_webm_vp8_800kbps_30fps_opus_5ch_320kbps_48000hz.webm",
};
public void testVp8Count0320x0180() throws Exception { count(sVp8Media0320x0180, 2, 2); }
@@ -600,8 +592,8 @@
public void testVp8Other0Perf0320x0180() throws Exception { perf(sVp8Media0320x0180, OTHER, 0); }
public void testVp8Other1Perf0320x0180() throws Exception { perf(sVp8Media0320x0180, OTHER, 1); }
- private static final int[] sVp8Media0640x0360 = {
- R.raw.bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz,
+ private static final String[] sVp8Media0640x0360 = {
+ "bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz.webm",
};
public void testVp8Count0640x0360() throws Exception { count(sVp8Media0640x0360, 2, 2); }
@@ -611,9 +603,9 @@
public void testVp8Other1Perf0640x0360() throws Exception { perf(sVp8Media0640x0360, OTHER, 1); }
// prefer highest effective bitrate
- private static final int[] sVp8Media1280x0720 = {
- R.raw.bbb_s4_1280x720_webm_vp8_8mbps_30fps_opus_mono_64kbps_48000hz,
- R.raw.bbb_s3_1280x720_webm_vp8_8mbps_60fps_opus_6ch_384kbps_48000hz,
+ private static final String[] sVp8Media1280x0720 = {
+ "bbb_s4_1280x720_webm_vp8_8mbps_30fps_opus_mono_64kbps_48000hz.webm",
+ "bbb_s3_1280x720_webm_vp8_8mbps_60fps_opus_6ch_384kbps_48000hz.webm",
};
public void testVp8Count1280x0720() throws Exception { count(sVp8Media1280x0720, 2, 2); }
@@ -623,9 +615,9 @@
public void testVp8Other1Perf1280x0720() throws Exception { perf(sVp8Media1280x0720, OTHER, 1); }
// prefer highest effective bitrate
- private static final int[] sVp8Media1920x1080 = {
- R.raw.bbb_s4_1920x1080_wide_webm_vp8_20mbps_30fps_vorbis_6ch_384kbps_44100hz,
- R.raw.bbb_s2_1920x1080_webm_vp8_20mbps_60fps_vorbis_6ch_384kbps_48000hz,
+ private static final String[] sVp8Media1920x1080 = {
+ "bbb_s4_1920x1080_wide_webm_vp8_20mbps_30fps_vorbis_6ch_384kbps_44100hz.webm",
+ "bbb_s2_1920x1080_webm_vp8_20mbps_60fps_vorbis_6ch_384kbps_48000hz.webm",
};
public void testVp8Count1920x1080() throws Exception { count(sVp8Media1920x1080, 2, 2); }
@@ -636,8 +628,8 @@
// VP9 tests
- private static final int[] sVp9Media0320x0180 = {
- R.raw.bbb_s1_320x180_webm_vp9_0p11_600kbps_30fps_vorbis_mono_64kbps_48000hz,
+ private static final String[] sVp9Media0320x0180 = {
+ "bbb_s1_320x180_webm_vp9_0p11_600kbps_30fps_vorbis_mono_64kbps_48000hz.webm",
};
public void testVp9Count0320x0180() throws Exception { count(sVp9Media0320x0180, 2, 4); }
@@ -648,8 +640,8 @@
public void testVp9Other2Perf0320x0180() throws Exception { perf(sVp9Media0320x0180, OTHER, 2); }
public void testVp9Other3Perf0320x0180() throws Exception { perf(sVp9Media0320x0180, OTHER, 3); }
- private static final int[] sVp9Media0640x0360 = {
- R.raw.bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz,
+ private static final String[] sVp9Media0640x0360 = {
+ "bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm",
};
public void testVp9Count0640x0360() throws Exception { count(sVp9Media0640x0360, 2, 4); }
@@ -660,8 +652,8 @@
public void testVp9Other2Perf0640x0360() throws Exception { perf(sVp9Media0640x0360, OTHER, 2); }
public void testVp9Other3Perf0640x0360() throws Exception { perf(sVp9Media0640x0360, OTHER, 3); }
- private static final int[] sVp9Media1280x0720 = {
- R.raw.bbb_s4_1280x720_webm_vp9_0p31_4mbps_30fps_opus_stereo_128kbps_48000hz,
+ private static final String[] sVp9Media1280x0720 = {
+ "bbb_s4_1280x720_webm_vp9_0p31_4mbps_30fps_opus_stereo_128kbps_48000hz.webm",
};
public void testVp9Count1280x0720() throws Exception { count(sVp9Media1280x0720, 2, 4); }
@@ -672,8 +664,8 @@
public void testVp9Other2Perf1280x0720() throws Exception { perf(sVp9Media1280x0720, OTHER, 2); }
public void testVp9Other3Perf1280x0720() throws Exception { perf(sVp9Media1280x0720, OTHER, 3); }
- private static final int[] sVp9Media1920x1080 = {
- R.raw.bbb_s2_1920x1080_webm_vp9_0p41_10mbps_60fps_vorbis_6ch_384kbps_22050hz,
+ private static final String[] sVp9Media1920x1080 = {
+ "bbb_s2_1920x1080_webm_vp9_0p41_10mbps_60fps_vorbis_6ch_384kbps_22050hz.webm",
};
public void testVp9Count1920x1080() throws Exception { count(sVp9Media1920x1080, 2, 4); }
@@ -685,9 +677,9 @@
public void testVp9Other3Perf1920x1080() throws Exception { perf(sVp9Media1920x1080, OTHER, 3); }
// prefer highest effective bitrate
- private static final int[] sVp9Media3840x2160 = {
- R.raw.bbb_s4_3840x2160_webm_vp9_0p5_20mbps_30fps_vorbis_6ch_384kbps_24000hz,
- R.raw.bbb_s2_3840x2160_webm_vp9_0p51_20mbps_60fps_vorbis_6ch_384kbps_32000hz,
+ private static final String[] sVp9Media3840x2160 = {
+ "bbb_s4_3840x2160_webm_vp9_0p5_20mbps_30fps_vorbis_6ch_384kbps_24000hz.webm",
+ "bbb_s2_3840x2160_webm_vp9_0p51_20mbps_60fps_vorbis_6ch_384kbps_32000hz.webm",
};
public void testVp9Count3840x2160() throws Exception { count(sVp9Media3840x2160, 2, 4); }
diff --git a/tests/tests/mediaparser/Android.bp b/tests/tests/mediaparser/Android.bp
index 6f2f1d9..d24d764 100644
--- a/tests/tests/mediaparser/Android.bp
+++ b/tests/tests/mediaparser/Android.bp
@@ -31,7 +31,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/mediastress/Android.bp b/tests/tests/mediastress/Android.bp
index d538e16..fbf336b 100644
--- a/tests/tests/mediastress/Android.bp
+++ b/tests/tests/mediastress/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/midi/Android.bp b/tests/tests/midi/Android.bp
index db46fda..fa9105e 100644
--- a/tests/tests/midi/Android.bp
+++ b/tests/tests/midi/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/mimemap/Android.bp b/tests/tests/mimemap/Android.bp
index 529e4de..4306164 100644
--- a/tests/tests/mimemap/Android.bp
+++ b/tests/tests/mimemap/Android.bp
@@ -28,7 +28,6 @@
test_suites: [
"cts",
"mts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/multiuser/Android.bp b/tests/tests/multiuser/Android.bp
index 7670b44..99adf1c 100644
--- a/tests/tests/multiuser/Android.bp
+++ b/tests/tests/multiuser/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/nativehardware/Android.bp b/tests/tests/nativehardware/Android.bp
index 4a84680..d8f1e90 100644
--- a/tests/tests/nativehardware/Android.bp
+++ b/tests/tests/nativehardware/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/tests/tests/nativemedia/aaudio/Android.mk b/tests/tests/nativemedia/aaudio/Android.mk
index 2f42de8..ed3814d 100644
--- a/tests/tests/nativemedia/aaudio/Android.mk
+++ b/tests/tests/nativemedia/aaudio/Android.mk
@@ -25,7 +25,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt nativetesthelper
diff --git a/tests/tests/nativemedia/mediametrics/Android.bp b/tests/tests/nativemedia/mediametrics/Android.bp
index 8ff68b6..11be644 100644
--- a/tests/tests/nativemedia/mediametrics/Android.bp
+++ b/tests/tests/nativemedia/mediametrics/Android.bp
@@ -42,7 +42,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/nativemedia/sl/Android.mk b/tests/tests/nativemedia/sl/Android.mk
index 5b545e9..0844d0c 100644
--- a/tests/tests/nativemedia/sl/Android.mk
+++ b/tests/tests/nativemedia/sl/Android.mk
@@ -42,7 +42,7 @@
LOCAL_CTS_TEST_PACKAGE := android.nativemedia.sl
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CFLAGS := -Werror -Wall -Wno-deprecated-declarations
diff --git a/tests/tests/nativemedia/xa/Android.mk b/tests/tests/nativemedia/xa/Android.mk
index 27c9e5f..c9dec22 100644
--- a/tests/tests/nativemedia/xa/Android.mk
+++ b/tests/tests/nativemedia/xa/Android.mk
@@ -43,6 +43,6 @@
LOCAL_CTS_TEST_PACKAGE := android.nativemedia.xa
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_CTS_EXECUTABLE)
diff --git a/tests/tests/nativemidi/Android.mk b/tests/tests/nativemidi/Android.mk
index 2b00ab9..8c628bc 100755
--- a/tests/tests/nativemidi/Android.mk
+++ b/tests/tests/nativemidi/Android.mk
@@ -26,7 +26,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SRC_FILES := $(call all-java-files-under, java)
diff --git a/tests/tests/ndef/Android.bp b/tests/tests/ndef/Android.bp
index c44005a..8a58309 100644
--- a/tests/tests/ndef/Android.bp
+++ b/tests/tests/ndef/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/net/Android.bp b/tests/tests/net/Android.bp
index 4c00428..913380a 100644
--- a/tests/tests/net/Android.bp
+++ b/tests/tests/net/Android.bp
@@ -66,7 +66,6 @@
defaults: ["CtsNetTestCasesDefaults"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
test_config_template: "AndroidTestTemplate.xml",
diff --git a/tests/tests/net/api23Test/Android.bp b/tests/tests/net/api23Test/Android.bp
index 0ce9826..e43a5e8 100644
--- a/tests/tests/net/api23Test/Android.bp
+++ b/tests/tests/net/api23Test/Android.bp
@@ -45,7 +45,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/net/appForApi23/Android.bp b/tests/tests/net/appForApi23/Android.bp
index 399c199..cec6d7f 100644
--- a/tests/tests/net/appForApi23/Android.bp
+++ b/tests/tests/net/appForApi23/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/net/jni/NativeMultinetworkJni.cpp b/tests/tests/net/jni/NativeMultinetworkJni.cpp
index cd94709..60e31bc 100644
--- a/tests/tests/net/jni/NativeMultinetworkJni.cpp
+++ b/tests/tests/net/jni/NativeMultinetworkJni.cpp
@@ -458,20 +458,16 @@
setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo));
// For reference see:
- // https://tools.ietf.org/html/draft-tsvwg-quic-protocol#section-6.1
+ // https://datatracker.ietf.org/doc/html/draft-ietf-quic-invariants
uint8_t quic_packet[1200] = {
- 0x0d, // public flags:
- // - version present (0x01),
- // - 64bit connection ID (0x0c),
- // - 1 byte packet number (0x00)
+ 0xc0, // long header
+ 0xaa, 0xda, 0xca, 0xca, // reserved-space version number
+ 0x08, // destination connection ID length
0, 0, 0, 0, 0, 0, 0, 0, // 64bit connection ID
- 0xaa, 0xda, 0xca, 0xaa, // reserved-space version number
- 1, // 1 byte packet number
- 0x00, // private flags
- 0x07, // PING frame (cuz why not)
+ 0x00, // source connection ID length
};
- arc4random_buf(quic_packet + 1, 8); // random connection ID
+ arc4random_buf(quic_packet + 6, 8); // random connection ID
uint8_t response[1500];
ssize_t sent, rcvd;
@@ -496,7 +492,7 @@
i + 1, MAX_RETRIES, rcvd, errnum);
}
}
- if (rcvd < 9) {
+ if (rcvd < 15) {
LOGD("QUIC UDP %s: sent=%zd but rcvd=%zd, errno=%d", kPort, sent, rcvd, errnum);
if (rcvd <= 0) {
LOGD("Does this network block UDP port %s?", kPort);
@@ -505,7 +501,7 @@
return -EPROTO;
}
- int conn_id_cmp = memcmp(quic_packet + 1, response + 1, 8);
+ int conn_id_cmp = memcmp(quic_packet + 6, response + 7, 8);
if (conn_id_cmp != 0) {
LOGD("sent and received connection IDs do not match");
close(fd);
diff --git a/tests/tests/net/native/qtaguid/Android.bp b/tests/tests/net/native/qtaguid/Android.bp
index 23a0cf7..7c6e19f 100644
--- a/tests/tests/net/native/qtaguid/Android.bp
+++ b/tests/tests/net/native/qtaguid/Android.bp
@@ -42,7 +42,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
],
cflags: [
diff --git a/tests/tests/net/src/android/net/cts/CaptivePortalTest.kt b/tests/tests/net/src/android/net/cts/CaptivePortalTest.kt
index 12a966f..f2c5028 100644
--- a/tests/tests/net/src/android/net/cts/CaptivePortalTest.kt
+++ b/tests/tests/net/src/android/net/cts/CaptivePortalTest.kt
@@ -30,11 +30,9 @@
import android.net.NetworkRequest
import android.net.Uri
import android.net.cts.NetworkValidationTestUtil.clearValidationTestUrlsDeviceConfig
-import android.net.cts.NetworkValidationTestUtil.runAsShell
import android.net.cts.NetworkValidationTestUtil.setHttpUrlDeviceConfig
import android.net.cts.NetworkValidationTestUtil.setHttpsUrlDeviceConfig
import android.net.cts.NetworkValidationTestUtil.setUrlExpirationDeviceConfig
-import com.android.testutils.TestHttpServer.Request
import android.net.cts.util.CtsNetUtils
import android.net.util.NetworkStackUtils.TEST_CAPTIVE_PORTAL_HTTPS_URL
import android.net.util.NetworkStackUtils.TEST_CAPTIVE_PORTAL_HTTP_URL
@@ -47,7 +45,9 @@
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
import androidx.test.runner.AndroidJUnit4
import com.android.testutils.TestHttpServer
+import com.android.testutils.TestHttpServer.Request
import com.android.testutils.isDevSdkInRange
+import com.android.testutils.runAsShell
import fi.iki.elonen.NanoHTTPD.Response.Status
import junit.framework.AssertionFailedError
import org.junit.After
diff --git a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
index 4f42ccc..db4e3e7 100644
--- a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -224,6 +224,16 @@
if (mCtsNetUtils.cellConnectAttempted()) {
mCtsNetUtils.disconnectFromCell();
}
+
+ // All tests in this class require a working Internet connection as they start. Make
+ // sure there is still one as they end that's ready to use for the next test to use.
+ final TestNetworkCallback callback = new TestNetworkCallback();
+ mCm.registerDefaultNetworkCallback(callback);
+ try {
+ assertNotNull("Couldn't restore Internet connectivity", callback.waitForAvailable());
+ } finally {
+ mCm.unregisterNetworkCallback(callback);
+ }
}
/**
diff --git a/tests/tests/net/src/android/net/cts/NetworkValidationTest.kt b/tests/tests/net/src/android/net/cts/NetworkValidationTest.kt
index ec656de..5290f0d 100644
--- a/tests/tests/net/src/android/net/cts/NetworkValidationTest.kt
+++ b/tests/tests/net/src/android/net/cts/NetworkValidationTest.kt
@@ -31,7 +31,6 @@
import android.net.TestNetworkInterface
import android.net.TestNetworkManager
import android.net.Uri
-import android.net.cts.NetworkValidationTestUtil.runAsShell
import android.net.dhcp.DhcpDiscoverPacket
import android.net.dhcp.DhcpPacket
import android.net.dhcp.DhcpPacket.DHCP_MESSAGE_TYPE
@@ -45,8 +44,7 @@
import androidx.test.runner.AndroidJUnit4
import com.android.net.module.util.Inet4AddressUtils.getBroadcastAddress
import com.android.net.module.util.Inet4AddressUtils.getPrefixMaskAsInet4Address
-import com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY
-import com.android.testutils.ArpResponder
+import com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY
import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.DhcpClientPacketFilter
import com.android.testutils.DhcpOptionFilter
@@ -54,10 +52,10 @@
import com.android.testutils.TapPacketReader
import com.android.testutils.TestHttpServer
import com.android.testutils.TestableNetworkCallback
+import com.android.testutils.runAsShell
import fi.iki.elonen.NanoHTTPD.Response.Status
import org.junit.After
import org.junit.Assume.assumeFalse
-import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -131,7 +129,7 @@
handlerThread.threadHandler,
iface.fileDescriptor.fileDescriptor,
MAX_PACKET_LENGTH)
- handlerThread.threadHandler.post { reader.start() }
+ reader.startAsyncForTest()
httpServer.start()
// Pad the listening port to make sure it is always of length 5. This ensures the URL has
@@ -233,7 +231,7 @@
timeoutMs: Long,
type: Byte
): T {
- val packetBytes = popPacket(timeoutMs, DhcpClientPacketFilter()
+ val packetBytes = poll(timeoutMs, DhcpClientPacketFilter()
.and(DhcpOptionFilter(DHCP_MESSAGE_TYPE, type)))
?: fail("${packetType.simpleName} not received within timeout")
val packet = DhcpPacket.decodeFullPacket(packetBytes, packetBytes.size, DhcpPacket.ENCAP_L2)
diff --git a/tests/tests/net/src/android/net/cts/NetworkValidationTestUtil.kt b/tests/tests/net/src/android/net/cts/NetworkValidationTestUtil.kt
index 5ef1854..f6fc75b 100644
--- a/tests/tests/net/src/android/net/cts/NetworkValidationTestUtil.kt
+++ b/tests/tests/net/src/android/net/cts/NetworkValidationTestUtil.kt
@@ -19,9 +19,7 @@
import android.Manifest
import android.net.util.NetworkStackUtils
import android.provider.DeviceConfig
-import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
-import com.android.compatibility.common.util.ThrowingRunnable
-import kotlin.test.fail
+import com.android.testutils.runAsShell
/**
* Collection of utility methods for configuring network validation.
@@ -67,13 +65,4 @@
DeviceConfig.NAMESPACE_CONNECTIVITY, configKey, value, false /* makeDefault */)
}
}
-
- /**
- * Wrapper around runWithShellPermissionIdentity with kotlin-like syntax.
- */
- fun <T> runAsShell(vararg permissions: String, task: () -> T): T {
- var ret: T? = null
- runWithShellPermissionIdentity(ThrowingRunnable { ret = task() }, *permissions)
- return ret ?: fail("ThrowingRunnable did not return")
- }
}
\ No newline at end of file
diff --git a/tests/tests/netpermission/internetpermission/Android.bp b/tests/tests/netpermission/internetpermission/Android.bp
index 98a167e..196c2bb 100644
--- a/tests/tests/netpermission/internetpermission/Android.bp
+++ b/tests/tests/netpermission/internetpermission/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/netpermission/updatestatspermission/Android.bp b/tests/tests/netpermission/updatestatspermission/Android.bp
index b1c3f0f..bc4f4de 100644
--- a/tests/tests/netpermission/updatestatspermission/Android.bp
+++ b/tests/tests/netpermission/updatestatspermission/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.bp b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.bp
index b2c1bf1..b6aa133 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.bp
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.bp b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.bp
index d6b4f59..8386fec 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.bp
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.bp b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.bp
index f596376..da1d9b9 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.bp
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.bp
index 74de818..356a02f 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.bp
index dc21be3..83c2d44 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.bp
index 86507d7..a684e69 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.bp
index bce2469..c72adb0 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.bp
index 041c0a1..7eb9401 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.bp
index cd71fbc..4ae4b5b 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.bp
index 26851d4..a0841a3 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.bp
index 2aeebfe..d5599c0 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.bp
index 54deb24..5ff160c 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.bp b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.bp
index c7d7128..1e553ab 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.bp
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/neuralnetworks/Android.mk b/tests/tests/neuralnetworks/Android.mk
index 9928e08..9e285b5 100644
--- a/tests/tests/neuralnetworks/Android.mk
+++ b/tests/tests/neuralnetworks/Android.mk
@@ -32,7 +32,7 @@
LOCAL_CTS_TEST_PACKAGE := android.neuralnetworks
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 mts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts mts general-tests
LOCAL_SDK_VERSION := current
LOCAL_NDK_STL_VARIANT := c++_static
diff --git a/tests/tests/neuralnetworks/benchmark/Android.mk b/tests/tests/neuralnetworks/benchmark/Android.mk
index 9df9c98..e6afeb4 100644
--- a/tests/tests/neuralnetworks/benchmark/Android.mk
+++ b/tests/tests/neuralnetworks/benchmark/Android.mk
@@ -27,7 +27,7 @@
LOCAL_MULTILIB := both
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 mts
+LOCAL_COMPATIBILITY_SUITE := cts mts
LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules \
compatibility-device-util-axt ctstestrunner-axt junit NeuralNetworksApiBenchmark_Lib
diff --git a/tests/tests/neuralnetworks/tflite_delegate/Android.mk b/tests/tests/neuralnetworks/tflite_delegate/Android.mk
index 091a070..11f23c4 100644
--- a/tests/tests/neuralnetworks/tflite_delegate/Android.mk
+++ b/tests/tests/neuralnetworks/tflite_delegate/Android.mk
@@ -66,7 +66,7 @@
LOCAL_CTS_TEST_PACKAGE := android.neuralnetworks
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 mts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts mts general-tests
LOCAL_SDK_VERSION := current
LOCAL_NDK_STL_VARIANT := c++_static
diff --git a/tests/tests/notificationlegacy/notificationlegacy20/Android.bp b/tests/tests/notificationlegacy/notificationlegacy20/Android.bp
index 06cf562..9ca0411 100644
--- a/tests/tests/notificationlegacy/notificationlegacy20/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy20/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "20",
diff --git a/tests/tests/notificationlegacy/notificationlegacy27/Android.bp b/tests/tests/notificationlegacy/notificationlegacy27/Android.bp
index 4cd91c5..4aca949 100644
--- a/tests/tests/notificationlegacy/notificationlegacy27/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy27/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "27",
diff --git a/tests/tests/notificationlegacy/notificationlegacy28/Android.bp b/tests/tests/notificationlegacy/notificationlegacy28/Android.bp
index 18acf25..fb8375e 100644
--- a/tests/tests/notificationlegacy/notificationlegacy28/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy28/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "28",
diff --git a/tests/tests/notificationlegacy/notificationlegacy29/Android.bp b/tests/tests/notificationlegacy/notificationlegacy29/Android.bp
index 9cb8dca..5003597 100644
--- a/tests/tests/notificationlegacy/notificationlegacy29/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy29/Android.bp
@@ -29,7 +29,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts"
],
diff --git a/tests/tests/opengl/Android.bp b/tests/tests/opengl/Android.bp
index b585859..6737c30 100644
--- a/tests/tests/opengl/Android.bp
+++ b/tests/tests/opengl/Android.bp
@@ -48,7 +48,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/openglperf/Android.bp b/tests/tests/openglperf/Android.bp
index d8bc8ef..1da66cd 100644
--- a/tests/tests/openglperf/Android.bp
+++ b/tests/tests/openglperf/Android.bp
@@ -35,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/os/Android.bp b/tests/tests/os/Android.bp
index a7d08e4..c3592a7 100644
--- a/tests/tests/os/Android.bp
+++ b/tests/tests/os/Android.bp
@@ -49,7 +49,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index 632acf5..1b7938a 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk
@@ -21,7 +21,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
cts_platform_version_path := cts/tests/tests/os/assets/platform_versions.txt
cts_platform_version_string := $(shell cat $(cts_platform_version_path))
diff --git a/tests/tests/os/AutoRevokeDummyApp/Android.bp b/tests/tests/os/AutoRevokeDummyApp/Android.bp
index 6b38e38..d4abfc0 100644
--- a/tests/tests/os/AutoRevokeDummyApp/Android.bp
+++ b/tests/tests/os/AutoRevokeDummyApp/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"cts",
"vts",
- "vts10",
"mts",
"general-tests",
],
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/Android.bp b/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
index d53aa53..465d614 100644
--- a/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
+++ b/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/packageinstaller/atomicinstall/Android.bp b/tests/tests/packageinstaller/atomicinstall/Android.bp
index 3cef0d4..f6c767f 100644
--- a/tests/tests/packageinstaller/atomicinstall/Android.bp
+++ b/tests/tests/packageinstaller/atomicinstall/Android.bp
@@ -28,7 +28,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/packageinstaller/emptytestapp/Android.bp b/tests/tests/packageinstaller/emptytestapp/Android.bp
index 3c8939b..dafd4e9 100644
--- a/tests/tests/packageinstaller/emptytestapp/Android.bp
+++ b/tests/tests/packageinstaller/emptytestapp/Android.bp
@@ -21,7 +21,6 @@
test_suites: [
"arcts",
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/packageinstaller/install/Android.bp b/tests/tests/packageinstaller/install/Android.bp
index 350b8b3..fc0bf63 100644
--- a/tests/tests/packageinstaller/install/Android.bp
+++ b/tests/tests/packageinstaller/install/Android.bp
@@ -34,7 +34,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/packageinstaller/nopermission/Android.bp b/tests/tests/packageinstaller/nopermission/Android.bp
index c1c3c66..b3a57a4 100644
--- a/tests/tests/packageinstaller/nopermission/Android.bp
+++ b/tests/tests/packageinstaller/nopermission/Android.bp
@@ -37,7 +37,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/packageinstaller/nopermission25/Android.bp b/tests/tests/packageinstaller/nopermission25/Android.bp
index 4bfbc02..5a1921c 100644
--- a/tests/tests/packageinstaller/nopermission25/Android.bp
+++ b/tests/tests/packageinstaller/nopermission25/Android.bp
@@ -22,7 +22,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/packageinstaller/tapjacking/Android.bp b/tests/tests/packageinstaller/tapjacking/Android.bp
index 014b6bb..67a1af6 100644
--- a/tests/tests/packageinstaller/tapjacking/Android.bp
+++ b/tests/tests/packageinstaller/tapjacking/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as test artifact for cts
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/packageinstaller/uninstall/Android.bp b/tests/tests/packageinstaller/uninstall/Android.bp
index 53ecc9d..26e9d7e 100644
--- a/tests/tests/packageinstaller/uninstall/Android.bp
+++ b/tests/tests/packageinstaller/uninstall/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/packagewatchdog/Android.bp b/tests/tests/packagewatchdog/Android.bp
index 0f13a86..32fa31a 100644
--- a/tests/tests/packagewatchdog/Android.bp
+++ b/tests/tests/packagewatchdog/Android.bp
@@ -21,7 +21,6 @@
test_suites: [
"cts",
"vts",
- "vts10",
"general-tests",
"mts"
],
diff --git a/tests/tests/permission/Android.bp b/tests/tests/permission/Android.bp
index 2a6d9a9..a99565e 100644
--- a/tests/tests/permission/Android.bp
+++ b/tests/tests/permission/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Include both the 32 and 64 bit versions
diff --git a/tests/tests/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp b/tests/tests/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
index 331551f..1645e8d 100644
--- a/tests/tests/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
+++ b/tests/tests/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatAccessesLocationOnCommand/Android.bp b/tests/tests/permission/AppThatAccessesLocationOnCommand/Android.bp
index 04faf1b..4e1272a 100644
--- a/tests/tests/permission/AppThatAccessesLocationOnCommand/Android.bp
+++ b/tests/tests/permission/AppThatAccessesLocationOnCommand/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: [
diff --git a/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp b/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
index c8fd250..fdff4ae 100644
--- a/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
+++ b/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.kt"],
diff --git a/tests/tests/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp b/tests/tests/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
index ec21bed..56a8000 100644
--- a/tests/tests/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
+++ b/tests/tests/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp b/tests/tests/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
index 2e3a777..f1a436b 100644
--- a/tests/tests/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
+++ b/tests/tests/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestContactsPermission15/Android.bp b/tests/tests/permission/AppThatRequestContactsPermission15/Android.bp
index 3e1af1d..f443c41 100644
--- a/tests/tests/permission/AppThatRequestContactsPermission15/Android.bp
+++ b/tests/tests/permission/AppThatRequestContactsPermission15/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestContactsPermission16/Android.bp b/tests/tests/permission/AppThatRequestContactsPermission16/Android.bp
index 17dd3ba..3716cd2 100644
--- a/tests/tests/permission/AppThatRequestContactsPermission16/Android.bp
+++ b/tests/tests/permission/AppThatRequestContactsPermission16/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp b/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
index 0146b6c..9902790 100644
--- a/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
+++ b/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestLocationPermission22/Android.bp b/tests/tests/permission/AppThatRequestLocationPermission22/Android.bp
index 1383819..c9187eb 100644
--- a/tests/tests/permission/AppThatRequestLocationPermission22/Android.bp
+++ b/tests/tests/permission/AppThatRequestLocationPermission22/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestLocationPermission28/Android.bp b/tests/tests/permission/AppThatRequestLocationPermission28/Android.bp
index 5ed80ec..dd5dbc4 100644
--- a/tests/tests/permission/AppThatRequestLocationPermission28/Android.bp
+++ b/tests/tests/permission/AppThatRequestLocationPermission28/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestLocationPermission29/Android.bp b/tests/tests/permission/AppThatRequestLocationPermission29/Android.bp
index 9546523..95b1b76 100644
--- a/tests/tests/permission/AppThatRequestLocationPermission29/Android.bp
+++ b/tests/tests/permission/AppThatRequestLocationPermission29/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestLocationPermission29v4/Android.bp b/tests/tests/permission/AppThatRequestLocationPermission29v4/Android.bp
index 10d2a66..d21fa19 100644
--- a/tests/tests/permission/AppThatRequestLocationPermission29v4/Android.bp
+++ b/tests/tests/permission/AppThatRequestLocationPermission29v4/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestOneTimePermission/Android.bp b/tests/tests/permission/AppThatRequestOneTimePermission/Android.bp
index 01de19b..1f8a50a 100644
--- a/tests/tests/permission/AppThatRequestOneTimePermission/Android.bp
+++ b/tests/tests/permission/AppThatRequestOneTimePermission/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"mts",
"general-tests",
],
diff --git a/tests/tests/permission/AppThatRequestPermissionAandB/Android.bp b/tests/tests/permission/AppThatRequestPermissionAandB/Android.bp
index 5c93d93..fc424ea 100644
--- a/tests/tests/permission/AppThatRequestPermissionAandB/Android.bp
+++ b/tests/tests/permission/AppThatRequestPermissionAandB/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/permission/AppThatRequestPermissionAandC/Android.bp b/tests/tests/permission/AppThatRequestPermissionAandC/Android.bp
index bcc6b68..d38374f 100644
--- a/tests/tests/permission/AppThatRequestPermissionAandC/Android.bp
+++ b/tests/tests/permission/AppThatRequestPermissionAandC/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/permission/AppThatRequestStoragePermission28/Android.bp b/tests/tests/permission/AppThatRequestStoragePermission28/Android.bp
index cdc8bb0..f791a10 100644
--- a/tests/tests/permission/AppThatRequestStoragePermission28/Android.bp
+++ b/tests/tests/permission/AppThatRequestStoragePermission28/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRequestStoragePermission29/Android.bp b/tests/tests/permission/AppThatRequestStoragePermission29/Android.bp
index d2a4897..82f29e5 100644
--- a/tests/tests/permission/AppThatRequestStoragePermission29/Android.bp
+++ b/tests/tests/permission/AppThatRequestStoragePermission29/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppThatRunsRationaleTests/Android.bp b/tests/tests/permission/AppThatRunsRationaleTests/Android.bp
index 9555499..a4e98ce 100644
--- a/tests/tests/permission/AppThatRunsRationaleTests/Android.bp
+++ b/tests/tests/permission/AppThatRunsRationaleTests/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp b/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
index 688651e..9fe607e 100644
--- a/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
+++ b/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp b/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
index b8b258e..366fc75 100644
--- a/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
+++ b/tests/tests/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp b/tests/tests/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
index c9a4b93..36d164b 100644
--- a/tests/tests/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
+++ b/tests/tests/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/AppWithSharedUidThatRequestsPermissions/Android.bp b/tests/tests/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
index fc8d9ee..bc6072c 100644
--- a/tests/tests/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
+++ b/tests/tests/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/sdk28/Android.bp b/tests/tests/permission/sdk28/Android.bp
index 856bbd1..d742ed8 100644
--- a/tests/tests/permission/sdk28/Android.bp
+++ b/tests/tests/permission/sdk28/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/permission/telephony/Android.bp b/tests/tests/permission/telephony/Android.bp
index c5388ea..89ca269 100644
--- a/tests/tests/permission/telephony/Android.bp
+++ b/tests/tests/permission/telephony/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Include both the 32 and 64 bit versions
diff --git a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
index 01a0509..8c5ae37 100644
--- a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
+++ b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
index 5f92f31..548a494 100644
--- a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
+++ b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey2",
diff --git a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionDefinerApp/Android.bp b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionDefinerApp/Android.bp
index 94fa99e..ee87737 100644
--- a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionDefinerApp/Android.bp
+++ b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionDefinerApp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionUserApp/Android.bp b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionUserApp/Android.bp
index 6531cec..f720d7d 100644
--- a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionUserApp/Android.bp
+++ b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/InstalltimePermissionUserApp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey2",
diff --git a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
index dfe1440..0fc7142 100644
--- a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
+++ b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
index 6fc9fbf..f076640 100644
--- a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
+++ b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey2",
diff --git a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
index dee4227..756be5e 100644
--- a/tests/tests/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
+++ b/tests/tests/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/tests/tests/permission2/Android.bp b/tests/tests/permission2/Android.bp
index 29c5705..37b9e94 100644
--- a/tests/tests/permission2/Android.bp
+++ b/tests/tests/permission2/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: ["android.test.base"],
diff --git a/tests/tests/permission2/AndroidManifest.xml b/tests/tests/permission2/AndroidManifest.xml
index 50dba1f..475499e 100755
--- a/tests/tests/permission2/AndroidManifest.xml
+++ b/tests/tests/permission2/AndroidManifest.xml
@@ -41,9 +41,6 @@
<!-- need app that has CALL_PHONE but not PROCESS_OUTGOING_CALL -->
<uses-permission android:name="android.permission.CALL_PHONE"/>
-
- <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-
<!-- need app that has RECORD_AUDIO but not CAPTURE_AUDIO_OUTPUT -->
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
diff --git a/tests/tests/permission3/Android.bp b/tests/tests/permission3/Android.bp
index 975f7cd..576e1ed 100644
--- a/tests/tests/permission3/Android.bp
+++ b/tests/tests/permission3/Android.bp
@@ -43,7 +43,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/preference/Android.bp b/tests/tests/preference/Android.bp
index 2dde40f..4be4c95 100644
--- a/tests/tests/preference/Android.bp
+++ b/tests/tests/preference/Android.bp
@@ -18,7 +18,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/print/Android.bp b/tests/tests/print/Android.bp
index 0c1b40e..74afe97 100644
--- a/tests/tests/print/Android.bp
+++ b/tests/tests/print/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/print/ExternalPrintService/Android.bp b/tests/tests/print/ExternalPrintService/Android.bp
index eca73ff..8beddd5 100644
--- a/tests/tests/print/ExternalPrintService/Android.bp
+++ b/tests/tests/print/ExternalPrintService/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/proto/Android.bp b/tests/tests/proto/Android.bp
index 6406f25..88dd506 100644
--- a/tests/tests/proto/Android.bp
+++ b/tests/tests/proto/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
//sdl_version: "current",
diff --git a/tests/tests/provider/Android.bp b/tests/tests/provider/Android.bp
index eb9f80c..7d861a5 100644
--- a/tests/tests/provider/Android.bp
+++ b/tests/tests/provider/Android.bp
@@ -7,7 +7,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/provider/preconditions/Android.bp b/tests/tests/provider/preconditions/Android.bp
index 31247b0..2f2dfae 100644
--- a/tests/tests/provider/preconditions/Android.bp
+++ b/tests/tests/provider/preconditions/Android.bp
@@ -9,7 +9,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
host_supported: true,
diff --git a/tests/tests/renderscript/Android.mk b/tests/tests/renderscript/Android.mk
index f313550..bf121c2 100644
--- a/tests/tests/renderscript/Android.mk
+++ b/tests/tests/renderscript/Android.mk
@@ -41,7 +41,7 @@
LOCAL_SDK_VERSION := current
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_CTS_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/renderscriptlegacy/Android.mk b/tests/tests/renderscriptlegacy/Android.mk
index 7d7ebb7..98df8e9 100644
--- a/tests/tests/renderscriptlegacy/Android.mk
+++ b/tests/tests/renderscriptlegacy/Android.mk
@@ -31,6 +31,6 @@
LOCAL_SDK_VERSION := 19
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/resolverservice/Android.bp b/tests/tests/resolverservice/Android.bp
index 648e5df..af92ff1 100644
--- a/tests/tests/resolverservice/Android.bp
+++ b/tests/tests/resolverservice/Android.bp
@@ -28,7 +28,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
diff --git a/tests/tests/resourcesloader/Android.bp b/tests/tests/resourcesloader/Android.bp
index 74a7f4c..07c0517 100644
--- a/tests/tests/resourcesloader/Android.bp
+++ b/tests/tests/resourcesloader/Android.bp
@@ -21,7 +21,6 @@
test_suites: [
"cts",
"vts",
- "vts10",
"general-tests",
],
srcs: [
diff --git a/tests/tests/role/Android.bp b/tests/tests/role/Android.bp
index bb35032..6604415 100644
--- a/tests/tests/role/Android.bp
+++ b/tests/tests/role/Android.bp
@@ -30,7 +30,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/rsblas/Android.mk b/tests/tests/rsblas/Android.mk
index 88aa75a..6b18c5d 100644
--- a/tests/tests/rsblas/Android.mk
+++ b/tests/tests/rsblas/Android.mk
@@ -36,7 +36,7 @@
LOCAL_RENDERSCRIPT_FLAGS := -Wno-error=deprecated-declarations
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/rscpp/Android.mk b/tests/tests/rscpp/Android.mk
index e598a69..79e8a2c 100644
--- a/tests/tests/rscpp/Android.mk
+++ b/tests/tests/rscpp/Android.mk
@@ -37,7 +37,7 @@
LOCAL_SDK_VERSION := current
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_CTS_PACKAGE)
include $(LOCAL_PATH)/librscpptest/Android.mk
diff --git a/tests/tests/sax/Android.bp b/tests/tests/sax/Android.bp
index a4e31c9..8a1a30a 100644
--- a/tests/tests/sax/Android.bp
+++ b/tests/tests/sax/Android.bp
@@ -22,7 +22,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/secure_element/access_control/AccessControlApp1/Android.bp b/tests/tests/secure_element/access_control/AccessControlApp1/Android.bp
index 5c400a8..f94c8f5 100644
--- a/tests/tests/secure_element/access_control/AccessControlApp1/Android.bp
+++ b/tests/tests/secure_element/access_control/AccessControlApp1/Android.bp
@@ -7,7 +7,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"cts-instant",
],
@@ -36,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dist: {
diff --git a/tests/tests/secure_element/access_control/AccessControlApp2/Android.bp b/tests/tests/secure_element/access_control/AccessControlApp2/Android.bp
index dfb270b..0ac778c 100644
--- a/tests/tests/secure_element/access_control/AccessControlApp2/Android.bp
+++ b/tests/tests/secure_element/access_control/AccessControlApp2/Android.bp
@@ -7,7 +7,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"cts-instant",
],
@@ -36,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dist: {
diff --git a/tests/tests/secure_element/access_control/AccessControlApp3/Android.bp b/tests/tests/secure_element/access_control/AccessControlApp3/Android.bp
index 4219345..840b3b3 100644
--- a/tests/tests/secure_element/access_control/AccessControlApp3/Android.bp
+++ b/tests/tests/secure_element/access_control/AccessControlApp3/Android.bp
@@ -7,7 +7,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"cts-instant",
],
@@ -36,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dist: {
diff --git a/tests/tests/secure_element/omapi/Android.bp b/tests/tests/secure_element/omapi/Android.bp
index d1e0dab..99b8957 100644
--- a/tests/tests/secure_element/omapi/Android.bp
+++ b/tests/tests/secure_element/omapi/Android.bp
@@ -21,7 +21,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"cts-instant",
],
@@ -51,7 +50,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
dist: {
diff --git a/tests/tests/security/Android.bp b/tests/tests/security/Android.bp
index 1514c08..70f2ed7 100644
--- a/tests/tests/security/Android.bp
+++ b/tests/tests/security/Android.bp
@@ -59,7 +59,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"sts",
],
certificate: ":security_cts_test_certificate",
diff --git a/tests/tests/selinux/selinuxEphemeral/Android.bp b/tests/tests/selinux/selinuxEphemeral/Android.bp
index d6ba666..b1299d2 100644
--- a/tests/tests/selinux/selinuxEphemeral/Android.bp
+++ b/tests/tests/selinux/selinuxEphemeral/Android.bp
@@ -44,7 +44,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "21",
diff --git a/tests/tests/selinux/selinuxTargetSdk25/Android.bp b/tests/tests/selinux/selinuxTargetSdk25/Android.bp
index e1c6dfc..3021200 100644
--- a/tests/tests/selinux/selinuxTargetSdk25/Android.bp
+++ b/tests/tests/selinux/selinuxTargetSdk25/Android.bp
@@ -44,7 +44,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "21",
diff --git a/tests/tests/selinux/selinuxTargetSdk27/Android.bp b/tests/tests/selinux/selinuxTargetSdk27/Android.bp
index edee5d2..269b574 100644
--- a/tests/tests/selinux/selinuxTargetSdk27/Android.bp
+++ b/tests/tests/selinux/selinuxTargetSdk27/Android.bp
@@ -44,7 +44,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "21",
diff --git a/tests/tests/selinux/selinuxTargetSdk28/Android.bp b/tests/tests/selinux/selinuxTargetSdk28/Android.bp
index 42610ab..f2dddbc 100644
--- a/tests/tests/selinux/selinuxTargetSdk28/Android.bp
+++ b/tests/tests/selinux/selinuxTargetSdk28/Android.bp
@@ -44,7 +44,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "21",
diff --git a/tests/tests/selinux/selinuxTargetSdk29/Android.bp b/tests/tests/selinux/selinuxTargetSdk29/Android.bp
index b434e28..5307277 100644
--- a/tests/tests/selinux/selinuxTargetSdk29/Android.bp
+++ b/tests/tests/selinux/selinuxTargetSdk29/Android.bp
@@ -44,7 +44,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "21",
diff --git a/tests/tests/selinux/selinuxTargetSdkCurrent/Android.bp b/tests/tests/selinux/selinuxTargetSdkCurrent/Android.bp
index 4ff11fa..e192e84 100644
--- a/tests/tests/selinux/selinuxTargetSdkCurrent/Android.bp
+++ b/tests/tests/selinux/selinuxTargetSdkCurrent/Android.bp
@@ -44,7 +44,6 @@
platform_apis: true,
test_suites: [
"cts",
- "vts10",
"general-tests",
],
min_sdk_version: "21",
diff --git a/tests/tests/sharesheet/Android.bp b/tests/tests/sharesheet/Android.bp
index 4558698..5832998 100644
--- a/tests/tests/sharesheet/Android.bp
+++ b/tests/tests/sharesheet/Android.bp
@@ -18,7 +18,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/sharesheet/packages/Android.bp b/tests/tests/sharesheet/packages/Android.bp
index cf56e40..bb2f804 100644
--- a/tests/tests/sharesheet/packages/Android.bp
+++ b/tests/tests/sharesheet/packages/Android.bp
@@ -19,7 +19,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -36,7 +35,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -53,7 +51,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
diff --git a/tests/tests/shortcutmanager/Android.bp b/tests/tests/shortcutmanager/Android.bp
index 1cf8905..2c7667c 100644
--- a/tests/tests/shortcutmanager/Android.bp
+++ b/tests/tests/shortcutmanager/Android.bp
@@ -25,7 +25,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
@@ -41,7 +40,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -62,7 +60,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -83,7 +80,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -103,7 +99,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -123,7 +118,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -145,7 +139,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -167,7 +160,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -188,7 +180,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
aaptflags: [
@@ -207,7 +198,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["throttling/src/**/*.java"],
diff --git a/tests/tests/simpleperf/Android.mk b/tests/tests/simpleperf/Android.mk
index 4f90b95..7cae376 100644
--- a/tests/tests/simpleperf/Android.mk
+++ b/tests/tests/simpleperf/Android.mk
@@ -45,7 +45,7 @@
LOCAL_COMPATIBILITY_SUPPORT_FILES := \
$(foreach file, $(simpleperf_testdata_files), $(simpleperf_src_path)/$(file):CtsSimpleperfTestCases_$(file))
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_CTS_TEST_PACKAGE := android.simpleperf
include $(LLVM_DEVICE_BUILD_MK)
diff --git a/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/Android.bp b/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/Android.bp
index 48fc889..c53723b 100644
--- a/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/Android.bp
+++ b/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/simpleperf/CtsSimpleperfProfileableApp/Android.bp b/tests/tests/simpleperf/CtsSimpleperfProfileableApp/Android.bp
index e29cbe4..babe753 100644
--- a/tests/tests/simpleperf/CtsSimpleperfProfileableApp/Android.bp
+++ b/tests/tests/simpleperf/CtsSimpleperfProfileableApp/Android.bp
@@ -20,7 +20,6 @@
sdk_version: "current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/slice/Android.bp b/tests/tests/slice/Android.bp
index f9b891f..718b1d0 100644
--- a/tests/tests/slice/Android.bp
+++ b/tests/tests/slice/Android.bp
@@ -19,7 +19,6 @@
test_suites: [
"cts",
"sts",
- "vts10",
"general-tests",
],
libs: ["android.test.runner"],
diff --git a/tests/tests/speech/Android.bp b/tests/tests/speech/Android.bp
index 1ece558..ee5eb38 100644
--- a/tests/tests/speech/Android.bp
+++ b/tests/tests/speech/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Needed for testing O API
diff --git a/tests/tests/syncmanager/Android.bp b/tests/tests/syncmanager/Android.bp
index 1c0db68..61eb483 100644
--- a/tests/tests/syncmanager/Android.bp
+++ b/tests/tests/syncmanager/Android.bp
@@ -31,7 +31,6 @@
srcs: ["src/**/*.java"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/syncmanager/apps/Android.bp b/tests/tests/syncmanager/apps/Android.bp
index ef55658..d759221 100644
--- a/tests/tests/syncmanager/apps/Android.bp
+++ b/tests/tests/syncmanager/apps/Android.bp
@@ -28,7 +28,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "app1/AndroidManifest.xml",
@@ -51,7 +50,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
manifest: "app2/AndroidManifest.xml",
diff --git a/tests/tests/systemintents/Android.bp b/tests/tests/systemintents/Android.bp
index ab83f84..b3def56 100644
--- a/tests/tests/systemintents/Android.bp
+++ b/tests/tests/systemintents/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/systemui/Android.bp b/tests/tests/systemui/Android.bp
index 8c31d13..22ee8a3 100644
--- a/tests/tests/systemui/Android.bp
+++ b/tests/tests/systemui/Android.bp
@@ -17,7 +17,6 @@
defaults: ["cts_defaults"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: ["android.test.runner"],
diff --git a/tests/tests/telecom/Android.bp b/tests/tests/telecom/Android.bp
index dba30f9..2fdb0b3 100644
--- a/tests/tests/telecom/Android.bp
+++ b/tests/tests/telecom/Android.bp
@@ -73,7 +73,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/telecom/Api29InCallServiceTestApp/Android.bp b/tests/tests/telecom/Api29InCallServiceTestApp/Android.bp
index 52de449..74b42aa 100644
--- a/tests/tests/telecom/Api29InCallServiceTestApp/Android.bp
+++ b/tests/tests/telecom/Api29InCallServiceTestApp/Android.bp
@@ -28,7 +28,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/telecom/CallRedirectionServiceTestApp/Android.bp b/tests/tests/telecom/CallRedirectionServiceTestApp/Android.bp
index 09a7e9d..632a714 100644
--- a/tests/tests/telecom/CallRedirectionServiceTestApp/Android.bp
+++ b/tests/tests/telecom/CallRedirectionServiceTestApp/Android.bp
@@ -24,7 +24,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/tests/tests/telecom/CallScreeningServiceTestApp/Android.bp b/tests/tests/telecom/CallScreeningServiceTestApp/Android.bp
index 5f9c63b..79bf603 100644
--- a/tests/tests/telecom/CallScreeningServiceTestApp/Android.bp
+++ b/tests/tests/telecom/CallScreeningServiceTestApp/Android.bp
@@ -26,7 +26,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
optimize: {
diff --git a/tests/tests/telecom/CarModeTestApp/Android.bp b/tests/tests/telecom/CarModeTestApp/Android.bp
index 53dfd7b..53ea07e 100644
--- a/tests/tests/telecom/CarModeTestApp/Android.bp
+++ b/tests/tests/telecom/CarModeTestApp/Android.bp
@@ -28,7 +28,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/telecom/CarModeTestAppTwo/Android.bp b/tests/tests/telecom/CarModeTestAppTwo/Android.bp
index e02b9d8..4ab49df 100644
--- a/tests/tests/telecom/CarModeTestAppTwo/Android.bp
+++ b/tests/tests/telecom/CarModeTestAppTwo/Android.bp
@@ -29,7 +29,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/telecom/ThirdPtyInCallServiceTestApp/Android.bp b/tests/tests/telecom/ThirdPtyInCallServiceTestApp/Android.bp
index 46c0b0c..faf7305 100644
--- a/tests/tests/telecom/ThirdPtyInCallServiceTestApp/Android.bp
+++ b/tests/tests/telecom/ThirdPtyInCallServiceTestApp/Android.bp
@@ -28,7 +28,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java b/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java
index 606989b..6e8acd1 100644
--- a/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/AdhocConferenceTest.java
@@ -16,6 +16,7 @@
package android.telecom.cts;
+import static android.telecom.Connection.STATE_DISCONNECTED;
import static android.telecom.cts.TestUtils.WAIT_FOR_STATE_CHANGE_TIMEOUT_MS;
import android.net.Uri;
@@ -99,8 +100,37 @@
} catch (InterruptedException e) {
Log.i(TestUtils.TAG, "Test interrupted");
}
+ MockConference conference = (MockConference) resultPair.first;
Call call = mInCallCallbacks.getService().getLastConferenceCall();
- call.answer(VideoProfile.STATE_AUDIO_ONLY);
+ call.answer(VideoProfile.STATE_RX_ENABLED);
+ conference.acquireLock(WAIT_FOR_STATE_CHANGE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+ assertEquals(VideoProfile.STATE_RX_ENABLED, conference.getVideoState());
+ }
+
+ public void testAddNewIncomingConference_onReject() {
+ if (!mShouldTestTelecom) {
+ return;
+ }
+ Bundle extra = new Bundle();
+ mTelecomManager.addNewIncomingConference(TestUtils.TEST_PHONE_ACCOUNT_HANDLE, extra);
+ Pair<Conference, ConnectionRequest> resultPair = verifyAdhocConferenceCall();
+ assertTrue(resultPair.second.isAdhocConferenceCall());
+ try {
+ if (!mInCallCallbacks.lock.tryAcquire(WAIT_FOR_STATE_CHANGE_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS)) {
+ fail("No conference call added.");
+ }
+ } catch (InterruptedException e) {
+ Log.i(TestUtils.TAG, "Test interrupted");
+ }
+ MockConference conference = (MockConference) resultPair.first;
+ Call call = mInCallCallbacks.getService().getLastConferenceCall();
+ call.reject(false /* rejectWithMessage */, null /* textMessage */);
+ conference.acquireLock(WAIT_FOR_STATE_CHANGE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+ for (Connection conn : conference.getConnections()) {
+ assertEquals(STATE_DISCONNECTED, conn.getState());
+ assertEquals(DisconnectCause.REJECTED, conn.getDisconnectCause().getCode());
+ }
}
public void testAddNewIncomingConferenceFailed() {
@@ -153,6 +183,7 @@
"Call should have capability " + Call.Details.CAPABILITY_ADD_PARTICIPANT
);
+ conference.resetLock();
call.addConferenceParticipants(PARTICIPANTS);
assertTrue(conference.acquireLock(WAIT_FOR_STATE_CHANGE_TIMEOUT_MS, TimeUnit.MILLISECONDS));
assertTrue(conference.mParticipants.containsAll(PARTICIPANTS));
diff --git a/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java b/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
index 9b63765..de19e23 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ConferenceTest.java
@@ -237,6 +237,9 @@
// just assert call state is not dialing, the state remains as previous one.
assertTrue(conf.getState() != Call.STATE_DIALING);
+ mConferenceObject.setRinging();
+ assertCallState(conf, Call.STATE_RINGING);
+
mConferenceObject.setOnHold();
assertCallState(conf, Call.STATE_HOLDING);
@@ -283,6 +286,10 @@
.dropShellPermissionIdentity();
}
+ assertFalse(mConferenceObject.isRingbackRequested());
+ mConferenceObject.setRingbackRequested(true);
+ assertTrue(mConferenceObject.isRingbackRequested());
+
mConferenceObject.setDisconnected(new DisconnectCause(DisconnectCause.LOCAL));
assertCallState(conf, Call.STATE_DISCONNECTED);
@@ -337,6 +344,16 @@
assertTrue(changedExtras.containsKey(TEST_EXTRA_KEY_2));
}
+ public void testCreateFailedConference() {
+ if (!mShouldTestTelecom) {
+ return;
+ }
+ Conference failedConference = Conference.createFailedConference(
+ new DisconnectCause(DisconnectCause.CANCELED), TEST_PHONE_ACCOUNT_HANDLE);
+ assertEquals(Connection.STATE_DISCONNECTED, failedConference.getState());
+ assertEquals(DisconnectCause.CANCELED, failedConference.getDisconnectCause().getCode());
+ }
+
/**
* Verifies {@link Conference#removeExtras(List)} calls are propagated to
* {@link android.telecom.Call.Callback#onDetailsChanged(Call, Call.Details)}.
diff --git a/tests/tests/telecom/src/android/telecom/cts/MockConference.java b/tests/tests/telecom/src/android/telecom/cts/MockConference.java
index 3692af8..1c8e9d9 100644
--- a/tests/tests/telecom/src/android/telecom/cts/MockConference.java
+++ b/tests/tests/telecom/src/android/telecom/cts/MockConference.java
@@ -24,6 +24,7 @@
import android.telecom.PhoneAccountHandle;
import android.telecom.RemoteConference;
import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
import java.util.ArrayList;
import java.util.List;
@@ -44,6 +45,7 @@
new TestUtils.InvokeCounter("onExtrasChanged");
public List<Uri> mParticipants = new ArrayList<>();
public CompletableFuture<Void> mLock = new CompletableFuture<>();
+ private int mVideoState = VideoProfile.STATE_AUDIO_ONLY;
public MockConference(PhoneAccountHandle phoneAccount) {
super(phoneAccount);
@@ -73,6 +75,20 @@
}
@Override
+ public void onReject() {
+ super.onReject();
+ for (Connection c : getConnections()) {
+ c.setDisconnected(new DisconnectCause(DisconnectCause.REJECTED));
+ c.destroy();
+ }
+ destroy();
+ if (mRemoteConference != null) {
+ mRemoteConference.disconnect();
+ }
+ mLock.complete(null);
+ }
+
+ @Override
public void onSeparate(Connection connection) {
super.onSeparate(connection);
if (getConnections().contains(connection)) {
@@ -158,6 +174,13 @@
mLock.complete(null);
}
+ @Override
+ public void onAnswer(int videoState) {
+ super.onAnswer(videoState);
+ mVideoState = videoState;
+ mLock.complete(null);
+ }
+
public void setRemoteConference(RemoteConference remoteConference) {
mRemoteConference = remoteConference;
Bundle bundle = remoteConference.getExtras();
@@ -174,6 +197,10 @@
return mDtmfString;
}
+ public int getVideoState() {
+ return mVideoState;
+ }
+
@Override
public void onExtrasChanged(Bundle extras) {
setExtras(extras);
@@ -188,4 +215,8 @@
}
return true;
}
+
+ public void resetLock() {
+ mLock = new CompletableFuture<>();
+ }
}
diff --git a/tests/tests/telecom2/Android.bp b/tests/tests/telecom2/Android.bp
index 549b534..abc14a8 100644
--- a/tests/tests/telecom2/Android.bp
+++ b/tests/tests/telecom2/Android.bp
@@ -35,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/telecom3/Android.bp b/tests/tests/telecom3/Android.bp
index 50ad122..1b87231 100644
--- a/tests/tests/telecom3/Android.bp
+++ b/tests/tests/telecom3/Android.bp
@@ -32,7 +32,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/telephony/current/Android.bp b/tests/tests/telephony/current/Android.bp
index 757e051..1d4e2cf 100644
--- a/tests/tests/telephony/current/Android.bp
+++ b/tests/tests/telephony/current/Android.bp
@@ -60,7 +60,6 @@
},
test_suites: [
"cts",
- "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/tests/tests/telephony/current/EmbmsMiddlewareTestApp/Android.bp b/tests/tests/telephony/current/EmbmsMiddlewareTestApp/Android.bp
index 7eccd36..b89abd4 100644
--- a/tests/tests/telephony/current/EmbmsMiddlewareTestApp/Android.bp
+++ b/tests/tests/telephony/current/EmbmsMiddlewareTestApp/Android.bp
@@ -28,6 +28,5 @@
test_suites: [
"cts",
"mts",
- "vts10",
],
}
diff --git a/tests/tests/telephony/current/LocationAccessingApp/Android.bp b/tests/tests/telephony/current/LocationAccessingApp/Android.bp
index 311c338..865d992 100644
--- a/tests/tests/telephony/current/LocationAccessingApp/Android.bp
+++ b/tests/tests/telephony/current/LocationAccessingApp/Android.bp
@@ -10,7 +10,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"mts",
],
}
diff --git a/tests/tests/telephony/current/LocationAccessingApp/sdk28/Android.bp b/tests/tests/telephony/current/LocationAccessingApp/sdk28/Android.bp
index f9664ad..7502492 100644
--- a/tests/tests/telephony/current/LocationAccessingApp/sdk28/Android.bp
+++ b/tests/tests/telephony/current/LocationAccessingApp/sdk28/Android.bp
@@ -7,7 +7,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"mts",
],
}
diff --git a/tests/tests/telephony/current/TestExternalImsServiceApp/Android.bp b/tests/tests/telephony/current/TestExternalImsServiceApp/Android.bp
index fa1b17d..560cb65 100644
--- a/tests/tests/telephony/current/TestExternalImsServiceApp/Android.bp
+++ b/tests/tests/telephony/current/TestExternalImsServiceApp/Android.bp
@@ -15,7 +15,6 @@
sdk_version: "test_current",
test_suites: [
"cts",
- "vts10",
"mts",
]
}
diff --git a/tests/tests/telephony/current/permissions/Android.bp b/tests/tests/telephony/current/permissions/Android.bp
index 0ae3ee4..ebd04ce 100644
--- a/tests/tests/telephony/current/permissions/Android.bp
+++ b/tests/tests/telephony/current/permissions/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// Include both the 32 and 64 bit versions
diff --git a/tests/tests/telephony/current/preconditions/Android.bp b/tests/tests/telephony/current/preconditions/Android.bp
index 9c1f950..ddb3262 100644
--- a/tests/tests/telephony/current/preconditions/Android.bp
+++ b/tests/tests/telephony/current/preconditions/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"mts",
"general-tests",
],
diff --git a/tests/tests/telephony/current/preconditions/app/Android.bp b/tests/tests/telephony/current/preconditions/app/Android.bp
index d4394ea..debc2e3 100644
--- a/tests/tests/telephony/current/preconditions/app/Android.bp
+++ b/tests/tests/telephony/current/preconditions/app/Android.bp
@@ -26,7 +26,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"mts",
"general-tests",
],
diff --git a/tests/tests/telephony/current/src/android/telephony/embms/cts/MbmsDownloadSessionTest.java b/tests/tests/telephony/current/src/android/telephony/embms/cts/MbmsDownloadSessionTest.java
index fe705aa..910050f 100644
--- a/tests/tests/telephony/current/src/android/telephony/embms/cts/MbmsDownloadSessionTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/embms/cts/MbmsDownloadSessionTest.java
@@ -243,4 +243,20 @@
assertEquals(MbmsErrors.GeneralErrors.ERROR_MIDDLEWARE_TEMPORARILY_UNAVAILABLE,
mCallback.waitOnError().arg1);
}
+
+ @Test
+ public void testMaxServiceAnnouncementSize() throws Exception {
+ byte[] sampleAnnouncementFile =
+ new byte[MbmsDownloadSession.getMaximumServiceAnnouncementSize() + 1];
+ Arrays.fill(sampleAnnouncementFile, (byte) 0b10101010);
+ try {
+ mDownloadSession.addServiceAnnouncement(sampleAnnouncementFile);
+ fail("Expected IllegalArgumentException due to size constraints");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ List<Bundle> addServiceAnnouncementCalls =
+ getMiddlewareCalls(CtsDownloadService.METHOD_ADD_SERVICE_ANNOUNCEMENT);
+ assertEquals(0, addServiceAnnouncementCalls.size());
+ }
}
diff --git a/tests/tests/telephony/sdk28/Android.bp b/tests/tests/telephony/sdk28/Android.bp
index e631442..2a3ecd1 100644
--- a/tests/tests/telephony/sdk28/Android.bp
+++ b/tests/tests/telephony/sdk28/Android.bp
@@ -26,7 +26,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/tests/tests/telephony2/Android.bp b/tests/tests/telephony2/Android.bp
index 3aeb64b..19a4fad 100644
--- a/tests/tests/telephony2/Android.bp
+++ b/tests/tests/telephony2/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: [
diff --git a/tests/tests/telephony3/Android.bp b/tests/tests/telephony3/Android.bp
index 2856b7c..7249851 100644
--- a/tests/tests/telephony3/Android.bp
+++ b/tests/tests/telephony3/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: ["android.test.runner"] + ["android.test.base"],
diff --git a/tests/tests/telephony4/Android.bp b/tests/tests/telephony4/Android.bp
index e745947..08097b5 100644
--- a/tests/tests/telephony4/Android.bp
+++ b/tests/tests/telephony4/Android.bp
@@ -30,7 +30,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
certificate: ":android_telephony_cts_testkey",
diff --git a/tests/tests/telephonyprovider/Android.bp b/tests/tests/telephonyprovider/Android.bp
index c1ef8db..59d3cbc 100644
--- a/tests/tests/telephonyprovider/Android.bp
+++ b/tests/tests/telephonyprovider/Android.bp
@@ -35,7 +35,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/text/Android.bp b/tests/tests/text/Android.bp
index eaf166e..0a7d918 100644
--- a/tests/tests/text/Android.bp
+++ b/tests/tests/text/Android.bp
@@ -47,7 +47,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/textclassifier/Android.bp b/tests/tests/textclassifier/Android.bp
index e5e43bb..c3e0383 100644
--- a/tests/tests/textclassifier/Android.bp
+++ b/tests/tests/textclassifier/Android.bp
@@ -20,7 +20,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts"
],
diff --git a/tests/tests/textclassifier/QueryTextClassifierServiceActivity/Android.bp b/tests/tests/textclassifier/QueryTextClassifierServiceActivity/Android.bp
index 17dd73c..ccc9362 100644
--- a/tests/tests/textclassifier/QueryTextClassifierServiceActivity/Android.bp
+++ b/tests/tests/textclassifier/QueryTextClassifierServiceActivity/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts"
],
diff --git a/tests/tests/theme/Android.bp b/tests/tests/theme/Android.bp
index d6958d9..20a8ce2 100644
--- a/tests/tests/theme/Android.bp
+++ b/tests/tests/theme/Android.bp
@@ -27,7 +27,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/toast/Android.bp b/tests/tests/toast/Android.bp
index 23dd572..aa85ab9 100644
--- a/tests/tests/toast/Android.bp
+++ b/tests/tests/toast/Android.bp
@@ -19,7 +19,6 @@
defaults: ["cts_defaults"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/toastlegacy/Android.bp b/tests/tests/toastlegacy/Android.bp
index f9bb54c..a558405 100644
--- a/tests/tests/toastlegacy/Android.bp
+++ b/tests/tests/toastlegacy/Android.bp
@@ -19,7 +19,6 @@
defaults: ["cts_defaults"],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/tools/processors/view_inspector/Android.bp b/tests/tests/tools/processors/view_inspector/Android.bp
index cfa6b1d..7b39403 100644
--- a/tests/tests/tools/processors/view_inspector/Android.bp
+++ b/tests/tests/tools/processors/view_inspector/Android.bp
@@ -28,7 +28,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
]
}
diff --git a/tests/tests/transition/Android.bp b/tests/tests/transition/Android.bp
index d11245f..35cd22a 100644
--- a/tests/tests/transition/Android.bp
+++ b/tests/tests/transition/Android.bp
@@ -32,7 +32,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/tv/Android.bp b/tests/tests/tv/Android.bp
index c4cd6a5..93e4be3 100644
--- a/tests/tests/tv/Android.bp
+++ b/tests/tests/tv/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/uiautomation/Android.bp b/tests/tests/uiautomation/Android.bp
index 7efacc3..9254d27 100644
--- a/tests/tests/uiautomation/Android.bp
+++ b/tests/tests/uiautomation/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/uidisolation/Android.bp b/tests/tests/uidisolation/Android.bp
index a99c3d1..0dbac1a 100644
--- a/tests/tests/uidisolation/Android.bp
+++ b/tests/tests/uidisolation/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
static_libs: [
diff --git a/tests/tests/uirendering/Android.bp b/tests/tests/uirendering/Android.bp
index ced693a..c014aa6 100644
--- a/tests/tests/uirendering/Android.bp
+++ b/tests/tests/uirendering/Android.bp
@@ -34,7 +34,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/uirendering27/Android.bp b/tests/tests/uirendering27/Android.bp
index 4e70339..07bc405 100644
--- a/tests/tests/uirendering27/Android.bp
+++ b/tests/tests/uirendering27/Android.bp
@@ -34,7 +34,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/util/Android.bp b/tests/tests/util/Android.bp
index 97efbe7..f2fa420 100644
--- a/tests/tests/util/Android.bp
+++ b/tests/tests/util/Android.bp
@@ -18,7 +18,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
libs: ["android.test.runner"],
diff --git a/tests/tests/vcn/OWNERS b/tests/tests/vcn/OWNERS
new file mode 100644
index 0000000..350d2db
--- /dev/null
+++ b/tests/tests/vcn/OWNERS
@@ -0,0 +1,2 @@
+nharold@google.com
+junyin@google.com
\ No newline at end of file
diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk
index 3ba381c..dd0c5b2 100644
--- a/tests/tests/view/Android.mk
+++ b/tests/tests/view/Android.mk
@@ -22,7 +22,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_MULTILIB := both
diff --git a/tests/tests/view/sdk28/Android.bp b/tests/tests/view/sdk28/Android.bp
index af0c4bc..71eb9e4 100644
--- a/tests/tests/view/sdk28/Android.bp
+++ b/tests/tests/view/sdk28/Android.bp
@@ -19,7 +19,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/voiceinteraction/Android.bp b/tests/tests/voiceinteraction/Android.bp
index f242200..c44c539 100644
--- a/tests/tests/voiceinteraction/Android.bp
+++ b/tests/tests/voiceinteraction/Android.bp
@@ -25,7 +25,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/voiceinteraction/service/Android.bp b/tests/tests/voiceinteraction/service/Android.bp
index 4033b4a..587ed1a 100644
--- a/tests/tests/voiceinteraction/service/Android.bp
+++ b/tests/tests/voiceinteraction/service/Android.bp
@@ -24,7 +24,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/voiceinteraction/testapp/Android.bp b/tests/tests/voiceinteraction/testapp/Android.bp
index 5d38ed2..94e1a0e 100644
--- a/tests/tests/voiceinteraction/testapp/Android.bp
+++ b/tests/tests/voiceinteraction/testapp/Android.bp
@@ -21,7 +21,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
\ No newline at end of file
diff --git a/tests/tests/voicesettings/Android.bp b/tests/tests/voicesettings/Android.bp
index e4d534f..d68dbaf 100644
--- a/tests/tests/voicesettings/Android.bp
+++ b/tests/tests/voicesettings/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/voicesettings/service/Android.bp b/tests/tests/voicesettings/service/Android.bp
index f759727..4a514a9 100644
--- a/tests/tests/voicesettings/service/Android.bp
+++ b/tests/tests/voicesettings/service/Android.bp
@@ -23,7 +23,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/tests/webkit/Android.bp b/tests/tests/webkit/Android.bp
index 229209c..13a4cf4 100644
--- a/tests/tests/webkit/Android.bp
+++ b/tests/tests/webkit/Android.bp
@@ -31,7 +31,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
// uncomment when dalvik.annotation.Test* are removed or part of SDK
diff --git a/tests/tests/widget/Android.bp b/tests/tests/widget/Android.bp
index b2ba7b1..20b79ce 100644
--- a/tests/tests/widget/Android.bp
+++ b/tests/tests/widget/Android.bp
@@ -41,7 +41,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/widget/app/Android.bp b/tests/tests/widget/app/Android.bp
index 50a8020..0ecbb72 100644
--- a/tests/tests/widget/app/Android.bp
+++ b/tests/tests/widget/app/Android.bp
@@ -24,7 +24,6 @@
],
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tests/tests/widget29/Android.bp b/tests/tests/widget29/Android.bp
index 7f09219..b2c26af 100644
--- a/tests/tests/widget29/Android.bp
+++ b/tests/tests/widget29/Android.bp
@@ -41,7 +41,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tests/tests/wifi/Android.bp b/tests/tests/wifi/Android.bp
index 0b7fb74..ed8daba 100644
--- a/tests/tests/wifi/Android.bp
+++ b/tests/tests/wifi/Android.bp
@@ -36,7 +36,6 @@
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tests/tests/wrap/nowrap/Android.mk b/tests/tests/wrap/nowrap/Android.mk
index e18f116..8f50ddc 100644
--- a/tests/tests/wrap/nowrap/Android.mk
+++ b/tests/tests/wrap/nowrap/Android.mk
@@ -26,7 +26,7 @@
androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := CtsWrapNoWrapTestCases
diff --git a/tests/tests/wrap/wrap_debug/Android.mk b/tests/tests/wrap/wrap_debug/Android.mk
index 4f750aa..e8d8f1f 100644
--- a/tests/tests/wrap/wrap_debug/Android.mk
+++ b/tests/tests/wrap/wrap_debug/Android.mk
@@ -26,7 +26,7 @@
androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := current
LOCAL_PREBUILT_JNI_LIBS_arm := ../wrap.sh
diff --git a/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk b/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
index 5992aa0..06a2850 100644
--- a/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
+++ b/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
@@ -26,7 +26,7 @@
androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := current
LOCAL_PREBUILT_JNI_LIBS_arm := wrap.sh
diff --git a/tests/tests/wrap/wrap_nodebug/Android.mk b/tests/tests/wrap/wrap_nodebug/Android.mk
index 3867574..aaebda2 100644
--- a/tests/tests/wrap/wrap_nodebug/Android.mk
+++ b/tests/tests/wrap/wrap_nodebug/Android.mk
@@ -26,7 +26,7 @@
androidx.test.rules
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
LOCAL_SDK_VERSION := current
LOCAL_PREBUILT_JNI_LIBS_arm := ../wrap.sh
diff --git a/tests/tvprovider/Android.bp b/tests/tvprovider/Android.bp
index 6a0feaa..a99191e 100644
--- a/tests/tvprovider/Android.bp
+++ b/tests/tvprovider/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/video/Android.bp b/tests/video/Android.bp
index fb22528..2741e64a 100644
--- a/tests/video/Android.bp
+++ b/tests/video/Android.bp
@@ -33,7 +33,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/tests/vr/Android.bp b/tests/vr/Android.bp
index 4227f1bb..69c9cd2 100644
--- a/tests/vr/Android.bp
+++ b/tests/vr/Android.bp
@@ -37,7 +37,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
}
diff --git a/tools/cts-device-info/Android.mk b/tools/cts-device-info/Android.mk
index d6140a5..cc67eee 100644
--- a/tools/cts-device-info/Android.mk
+++ b/tools/cts-device-info/Android.mk
@@ -40,7 +40,7 @@
LOCAL_PACKAGE_NAME := CtsDeviceInfo
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests sts mts vts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests sts mts vts
include $(BUILD_CTS_DEVICE_INFO_PACKAGE)
diff --git a/tools/cts-dynamic-config/Android.mk b/tools/cts-dynamic-config/Android.mk
index 4a6220a..4cb0c96 100644
--- a/tools/cts-dynamic-config/Android.mk
+++ b/tools/cts-dynamic-config/Android.mk
@@ -20,7 +20,7 @@
LOCAL_MODULE_CLASS := FAKE
LOCAL_IS_HOST_MODULE := true
-LOCAL_COMPATIBILITY_SUITE := cts general-tests vts10 mts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests mts
# my_test_config_file := DynamicConfig.xml
# TODO (sbasi): Update to use BUILD_HOST_TEST_CONFIG when it's primary install
diff --git a/tools/cts-media-preparer-app/Android.bp b/tools/cts-media-preparer-app/Android.bp
index 8199fc0..c073617 100644
--- a/tools/cts-media-preparer-app/Android.bp
+++ b/tools/cts-media-preparer-app/Android.bp
@@ -29,7 +29,6 @@
// tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
"mts",
],
diff --git a/tools/cts-preconditions/Android.bp b/tools/cts-preconditions/Android.bp
index f3decfd..100cb69 100644
--- a/tools/cts-preconditions/Android.bp
+++ b/tools/cts-preconditions/Android.bp
@@ -27,7 +27,6 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "vts10",
"general-tests",
],
diff --git a/tools/vm-tests-tf/Android.mk b/tools/vm-tests-tf/Android.mk
index fdbf169..44217ae 100644
--- a/tools/vm-tests-tf/Android.mk
+++ b/tools/vm-tests-tf/Android.mk
@@ -65,7 +65,7 @@
LOCAL_MODULE_PATH := $(intermediates)
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_SYSTEM)/base_rules.mk
diff --git a/tools/vm-tests-tf/targetprep/Android.mk b/tools/vm-tests-tf/targetprep/Android.mk
index b4c2bf0..b87b08a 100644
--- a/tools/vm-tests-tf/targetprep/Android.mk
+++ b/tools/vm-tests-tf/targetprep/Android.mk
@@ -25,7 +25,7 @@
LOCAL_MODULE := compatibility-host-vm-targetprep
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
include $(BUILD_HOST_JAVA_LIBRARY)