Remove cts-on-gsi-retry config as its not needed anymore am: f8f766d770 am: d8af67109f
am: e49e1f375b
Change-Id: I5e8f975fe88b994c5aaf3f195f4cc1f3ccf5b31e
diff --git a/proto/ComponentSpecificationMessage.proto b/proto/ComponentSpecificationMessage.proto
index b7db081..7a72c49 100644
--- a/proto/ComponentSpecificationMessage.proto
+++ b/proto/ComponentSpecificationMessage.proto
@@ -224,7 +224,7 @@
// using a VTS HAL driver (for HIDL HAL). 0 for the main interface.
optional int32 hidl_interface_id = 3;
- // whether the function is inherited from another interface.
+ // whether the function is inherited from another class.
optional bool is_inherited = 4;
// data type of the return value (for legacy HALs and shared libraries).
diff --git a/testcases/system/device_health/AndroidTest.xml b/testcases/system/device_health/AndroidTest.xml
index e5faa62..fdea26a 100644
--- a/testcases/system/device_health/AndroidTest.xml
+++ b/testcases/system/device_health/AndroidTest.xml
@@ -23,6 +23,6 @@
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.devicehealth.tests" />
- <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+ <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
</test>
</configuration>
diff --git a/tools/build/tasks/list/vts_adapter_package_list.mk b/tools/build/tasks/list/vts_adapter_package_list.mk
index 2756955..bc9c180 100644
--- a/tools/build/tasks/list/vts_adapter_package_list.mk
+++ b/tools/build/tasks/list/vts_adapter_package_list.mk
@@ -218,6 +218,8 @@
android.hardware.vibrator@1.1-adapter-helper \
android.hardware.vibrator@1.2-adapter \
android.hardware.vibrator@1.2-adapter-helper \
+ android.hardware.vibrator@1.3-adapter \
+ android.hardware.vibrator@1.3-adapter-helper \
android.hardware.vr@1.0-adapter \
android.hardware.vr@1.0-adapter-helper \
android.hardware.weaver@1.0-adapter \
@@ -236,6 +238,8 @@
android.hardware.wifi.supplicant@1.0-adapter-helper \
android.hardware.wifi.supplicant@1.1-adapter \
android.hardware.wifi.supplicant@1.1-adapter-helper \
+ android.hardware.wifi.supplicant@1.2-adapter \
+ android.hardware.wifi.supplicant@1.2-adapter-helper \
android.hidl.allocator@1.0-adapter \
android.hidl.allocator@1.0-adapter-helper \
android.hidl.base@1.0-adapter \
diff --git a/tools/build/tasks/list/vts_apk_package_list.mk b/tools/build/tasks/list/vts_apk_package_list.mk
index ec79590..7b77f88 100644
--- a/tools/build/tasks/list/vts_apk_package_list.mk
+++ b/tools/build/tasks/list/vts_apk_package_list.mk
@@ -18,6 +18,7 @@
VtsAgentApp \
CtsVerifier \
sl4a \
+ VtsHalNeuralnetworksV1_2BenchmarkTestCases \
# Other tests APKs included as part of VTS.
vts_apk_packages += \
diff --git a/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk b/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
index 512e3e9..307daee 100644
--- a/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
+++ b/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
@@ -14,6 +14,7 @@
# limitations under the License.
vts_hal_driver_libs := \
+ android.hardware.atrace@1.0-vts.driver \
android.hardware.audio@2.0-vts.driver \
android.hardware.audio.common@2.0-vts.driver \
android.hardware.audio.effect@2.0-vts.driver \
@@ -39,8 +40,10 @@
android.hardware.camera.metadata@3.3-vts.driver \
android.hardware.camera.provider@2.4-vts.driver \
android.hardware.cas@1.0-vts.driver \
+ android.hardware.cas@1.1-vts.driver \
android.hardware.cas.native@1.0-vts.driver \
android.hardware.configstore@1.0-vts.driver \
+ android.hardware.configstore@1.2-vts.driver \
android.hardware.confirmationui@1.0-vts.driver \
android.hardware.contexthub@1.0-vts.driver \
android.hardware.drm@1.0-vts.driver \
@@ -78,6 +81,7 @@
android.hardware.power@1.1-vts.driver \
android.hardware.power@1.2-vts.driver \
android.hardware.power@1.3-vts.driver \
+ android.hardware.power.stats@1.0-vts.driver \
android.hardware.radio@1.0-vts.driver \
android.hardware.radio@1.1-vts.driver \
android.hardware.radio@1.2-vts.driver \
@@ -94,6 +98,7 @@
android.hardware.tetheroffload.control@1.0-vts.driver \
android.hardware.thermal@1.0-vts.driver \
android.hardware.thermal@1.1-vts.driver \
+ android.hardware.thermal@2.0-vts.driver \
android.hardware.tv.cec@1.0-vts.driver \
android.hardware.tv.input@1.0-vts.driver \
android.hardware.usb@1.0-vts.driver \
@@ -102,6 +107,7 @@
android.hardware.vibrator@1.0-vts.driver \
android.hardware.vibrator@1.1-vts.driver \
android.hardware.vibrator@1.2-vts.driver \
+ android.hardware.vibrator@1.3-vts.driver \
android.hardware.vr@1.0-vts.driver \
android.hardware.weaver@1.0-vts.driver \
android.hardware.wifi@1.0-vts.driver \
@@ -111,12 +117,14 @@
android.hardware.wifi.offload@1.0-vts.driver \
android.hardware.wifi.supplicant@1.0-vts.driver \
android.hardware.wifi.supplicant@1.1-vts.driver \
+ android.hardware.wifi.supplicant@1.2-vts.driver \
android.hidl.memory.block@1.0-vts.driver \
android.hidl.memory.token@1.0-vts.driver \
android.system.net.netd@1.0-vts.driver \
android.system.net.netd@1.1-vts.driver \
vts_hal_profiler_libs := \
+ android.hardware.atrace@1.0-vts.profiler \
android.hardware.audio@2.0-vts.profiler \
android.hardware.audio.common@2.0-vts.profiler \
android.hardware.audio.effect@2.0-vts.profiler \
@@ -142,8 +150,10 @@
android.hardware.camera.metadata@3.3-vts.profiler \
android.hardware.camera.provider@2.4-vts.profiler \
android.hardware.cas@1.0-vts.profiler \
+ android.hardware.cas@1.1-vts.profiler \
android.hardware.cas.native@1.0-vts.profiler \
android.hardware.configstore@1.0-vts.profiler \
+ android.hardware.configstore@1.2-vts.profiler \
android.hardware.confirmationui@1.0-vts.profiler \
android.hardware.contexthub@1.0-vts.profiler \
android.hardware.drm@1.0-vts.profiler \
@@ -181,6 +191,7 @@
android.hardware.power@1.1-vts.profiler \
android.hardware.power@1.2-vts.profiler \
android.hardware.power@1.3-vts.profiler \
+ android.hardware.power.stats@1.0-vts.profiler \
android.hardware.radio@1.0-vts.profiler \
android.hardware.radio@1.1-vts.profiler \
android.hardware.radio@1.2-vts.profiler \
@@ -197,6 +208,7 @@
android.hardware.tetheroffload.control@1.0-vts.profiler \
android.hardware.thermal@1.0-vts.profiler \
android.hardware.thermal@1.1-vts.profiler \
+ android.hardware.thermal@2.0-vts.profiler \
android.hardware.tv.cec@1.0-vts.profiler \
android.hardware.tv.input@1.0-vts.profiler \
android.hardware.usb@1.0-vts.profiler \
@@ -205,6 +217,7 @@
android.hardware.vibrator@1.0-vts.profiler \
android.hardware.vibrator@1.1-vts.profiler \
android.hardware.vibrator@1.2-vts.profiler \
+ android.hardware.vibrator@1.3-vts.profiler \
android.hardware.vr@1.0-vts.profiler \
android.hardware.weaver@1.0-vts.profiler \
android.hardware.wifi@1.0-vts.profiler \
@@ -214,12 +227,14 @@
android.hardware.wifi.offload@1.0-vts.profiler \
android.hardware.wifi.supplicant@1.0-vts.profiler \
android.hardware.wifi.supplicant@1.1-vts.profiler \
+ android.hardware.wifi.supplicant@1.2-vts.profiler \
android.hidl.memory.block@1.0-vts.profiler \
android.hidl.memory.token@1.0-vts.profiler \
android.system.net.netd@1.0-vts.profiler \
android.system.net.netd@1.1-vts.profiler \
vts_hal_test_bins := \
+ VtsHalAtraceV1_0TargetTest \
VtsHalAudioV2_0TargetTest \
VtsHalAudioV4_0TargetTest \
VtsHalAudioEffectV2_0TargetTest \
@@ -233,7 +248,9 @@
VtsHalBroadcastradioV2_0TargetTest \
VtsHalCameraProviderV2_4TargetTest \
VtsHalCasV1_0TargetTest \
+ VtsHalCasV1_1TargetTest \
VtsHalConfigstoreV1_0TargetTest \
+ VtsHalConfigstoreV1_2TargetTest \
VtsHalContexthubV1_0TargetTest \
VtsHalDrmV1_0TargetTest \
VtsHalDrmV1_1TargetTest \
@@ -244,11 +261,13 @@
VtsHalGnssV1_1TargetTest \
VtsHalGraphicsComposerV2_1TargetTest \
VtsHalGraphicsComposerV2_2TargetTest \
+ VtsHalGraphicsComposerV2_3TargetTest \
VtsHalGraphicsMapperV2_0TargetTest \
VtsHalGraphicsMapperV2_1TargetTest \
VtsHalHealthStorageV1_0TargetTest \
VtsHalHealthV1_0TargetTest \
VtsHalHealthV2_0TargetTest \
+ VtsHalInputClassifierV1_0TargetTest \
VtsHalIrV1_0TargetTest \
VtsHalKeymasterV3_0TargetTest \
VtsHalKeymasterV4_0TargetTest \
@@ -271,6 +290,7 @@
VtsHalPowerV1_1TargetTest \
VtsHalPowerV1_2TargetTest \
VtsHalPowerV1_3TargetTest \
+ VtsHalPowerStatsV1_0TargetTest \
VtsHalRadioV1_0TargetTest \
VtsHalRadioV1_1TargetTest \
VtsHalRadioV1_2TargetTest \
@@ -282,34 +302,46 @@
VtsHalSensorsV1_0TargetTest \
VtsHalSoundtriggerV2_0TargetTest \
VtsHalSoundtriggerV2_1TargetTest \
+ VtsHalStatsV1_0TargetTest \
VtsHalTetheroffloadConfigV1_0TargetTest \
VtsHalTetheroffloadControlV1_0TargetTest \
VtsHalThermalV1_0TargetTest \
VtsHalThermalV1_1TargetTest \
+ VtsHalThermalV2_0TargetTest \
thermal_hidl_stress_test \
+ VtsHalBufferHubV1_0TargetTest \
VtsHalTvInputV1_0TargetTest \
VtsHalUsbV1_0TargetTest \
VtsHalUsbV1_1TargetTest \
VtsHalVibratorV1_0TargetTest \
VtsHalVibratorV1_1TargetTest \
VtsHalVibratorV1_2TargetTest \
+ VtsHalVibratorV1_3TargetTest \
VtsHalVrV1_0TargetTest \
VtsHalWeaverV1_0TargetTest \
+ VtsHalWifiHostapdV1_0TargetTest \
+ VtsHalWifiHostapdV1_1TargetTest \
VtsHalWifiKeystoreV1_0TargetTest \
VtsHalWifiV1_0TargetTest \
VtsHalWifiV1_1TargetTest \
VtsHalWifiV1_2TargetTest \
+ VtsHalWifiV1_3TargetTest \
VtsHalWifiNanV1_0TargetTest \
VtsHalWifiNanV1_2TargetTest \
VtsHalWifiOffloadV1_0TargetTest \
VtsHalWifiSupplicantV1_0TargetTest \
VtsHalWifiSupplicantV1_1TargetTest \
+ VtsHalWifiSupplicantV1_2TargetTest \
+ VtsHalWifiSupplicantP2pV1_0TargetTest \
+ VtsHalWifiSupplicantP2pV1_2TargetTest \
VtsHidlAllocatorV1_0TargetTest \
# Binaries which are part of VNDK but in the form of HIDL.
vts_hal_test_bins += \
VtsVndkHidlBufferpoolV1_0TargetSingleTest \
VtsVndkHidlBufferpoolV1_0TargetMultiTest \
+ VtsVndkHidlBufferpoolV2_0TargetSingleTest \
+ VtsVndkHidlBufferpoolV2_0TargetMultiTest \
vts_test_lib_hidl_packages := \
$(vts_hal_driver_libs) \
diff --git a/tools/vts-tradefed/res/config/vts-gce.xml b/tools/vts-tradefed/res/config/vts-gce.xml
index 7a623af..dd46831 100644
--- a/tools/vts-tradefed/res/config/vts-gce.xml
+++ b/tools/vts-tradefed/res/config/vts-gce.xml
@@ -41,6 +41,7 @@
<option name="compatibility:include-filter" value="VtsHalGatekeeperV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalGraphicsMapperV2_0Target" />
<option name="compatibility:include-filter" value="VtsHalGraphicsMapperV2_1Target" />
+ <option name="compatibility:include-filter" value="VtsHalInputClassifierV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalIrV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalKeymasterV4_0Target" />
<option name="compatibility:include-filter" value="VtsHalLightV2_0Target" />
@@ -70,6 +71,7 @@
<option name="compatibility:include-filter" value="VtsHalVibratorV1_0TargetReplay" />
<option name="compatibility:include-filter" value="VtsHalVibratorV1_1Target" />
<option name="compatibility:include-filter" value="VtsHalVibratorV1_2Target" />
+ <option name="compatibility:include-filter" value="VtsHalVibratorV1_3Target" />
<option name="compatibility:include-filter" value="VtsHalVrV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalVrV1_0TargetReplay" />
<option name="compatibility:include-filter" value="VtsHalWeaverV1_0Target" />
diff --git a/tools/vts-tradefed/res/config/vts-staging-default.xml b/tools/vts-tradefed/res/config/vts-staging-default.xml
index 87c89c5..16c3178 100644
--- a/tools/vts-tradefed/res/config/vts-staging-default.xml
+++ b/tools/vts-tradefed/res/config/vts-staging-default.xml
@@ -31,6 +31,17 @@
<option name="compatibility:include-filter" value="VtsHalThermalV1_0TargetReplay" />
<!-- for HAL adapter tests -->
- <option name="compatibility:include-filter" value="VtsHalVibratorV1_1AdapterCtsOsTestCases" />
- <option name="compatibility:include-filter" value="VtsHalVibratorV1_1AdapterDeviceHealthTests" />
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="true"/>
+ <option name="push" value="script/target/vts_adapter.sh->/data/local/tmp/vts_adapter.sh"/>
+ </target_preparer>
+
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-file-name" value="DeviceHealthTests.apk" />
+ <option name="cleanup-apks" value="true" />
+ </target_preparer>
+
+ <option name="compatibility:include-filter" value="VtsHalThermalV1_1Adapter" />
+ <option name="compatibility:include-filter" value="VtsHalUsbV1_2Adapter" />
+
</configuration>
diff --git a/tools/vts-tradefed/res/config/vts-staging-sancov.xml b/tools/vts-tradefed/res/config/vts-staging-sancov.xml
index b7d7edc..5572e85 100644
--- a/tools/vts-tradefed/res/config/vts-staging-sancov.xml
+++ b/tools/vts-tradefed/res/config/vts-staging-sancov.xml
@@ -33,12 +33,16 @@
<option name="compatibility:include-filter" value="VtsHalRadioV1_1Target" />
<option name="compatibility:include-filter" value="VtsHalRenderscriptV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalSapV1_0Target" />
+ <option name="compatibility:include-filter" value="VtsHalWifiHostapdV1_0Target" />
+ <option name="compatibility:include-filter" value="VtsHalWifiHostapdV1_1Target" />
<option name="compatibility:include-filter" value="VtsHalWifiV1_0Host" />
<option name="compatibility:include-filter" value="VtsHalWifiV1_1Target" />
<option name="compatibility:include-filter" value="VtsHalWifiNanV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalWifiOffloadV1_0Target" />
- <option name="compatibility:include-filter" value="VtsHalWifiSupplicantV1_0Target" />
- <option name="compatibility:include-filter" value="VtsHalWifiSupplicantV1_1Target" />
+ <option name="compatibility:include-filter" value="VtsHalWifiSupplicantV1_0Host" />
+ <option name="compatibility:include-filter" value="VtsHalWifiSupplicantV1_1Host" />
+ <option name="compatibility:include-filter" value="VtsHalWifiSupplicantP2pV1_0Target" />
+ <option name="compatibility:include-filter" value="VtsHalWifiSupplicantP2pV1_2Target" />
<option name="compatibility:include-filter" value="VtsHalAudioV2_0Target" />
<option name="compatibility:include-filter" value="VtsHalAudioV4_0Target" />
@@ -67,6 +71,7 @@
<option name="compatibility:include-filter" value="VtsHalSensorsV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalSoundtriggerV2_0Target" />
<option name="compatibility:include-filter" value="VtsHalSoundtriggerV2_1Target" />
+ <option name="compatibility:include-filter" value="VtsHalStatsV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalTetherOffloadConfigV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalTetherOffloadControlV1_0Target" />
<option name="compatibility:include-filter" value="VtsHalThermalV1_0Target" />