diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:40:14 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 16:40:14 +0000 |
| commit | 90e17255a869a2bdff13136beaa26cf4f38de891 (patch) | |
| tree | a1f4b4ef2567194c723cd8741356cca29728de03 | |
| parent | 1e76754044ce75be5268554aaef74400bf665ac5 (diff) | |
| parent | 945a28c07febef6c802da166203a23c3ff9f0a8e (diff) | |
| download | hal-aml_tz4_332714010.tar.gz | |
Snap for 11219529 from 945a28c07febef6c802da166203a23c3ff9f0a8e to mainline-tzdata4-releaseaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_332714010
Change-Id: I8356a26813cdb43179a80d78b8ab0fc0981dcf26
| -rw-r--r-- | treble/vintf/DeviceManifestTest.cpp | 22 | ||||
| -rw-r--r-- | usb/gadget/V1_1/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_1HostTest.java | 2 |
2 files changed, 1 insertions, 23 deletions
diff --git a/treble/vintf/DeviceManifestTest.cpp b/treble/vintf/DeviceManifestTest.cpp index 9a655fe3..eec781e3 100644 --- a/treble/vintf/DeviceManifestTest.cpp +++ b/treble/vintf/DeviceManifestTest.cpp @@ -44,28 +44,6 @@ TEST_F(DeviceManifestTest, ShippingFcmVersion) { ASSERT_RESULT_OK(res); } -TEST_F(DeviceManifestTest, KernelFcmVersion) { - const char* kHeader = - "Kernel FCM version (specified in VINTF manifests with <kernel " - "target-level=\"[0-9]+\"/> if not by /proc/version) "; - Level shipping_fcm_version = VintfObject::GetDeviceHalManifest()->level(); - - if (shipping_fcm_version == Level::UNSPECIFIED || - shipping_fcm_version < Level::R) { - GTEST_SKIP() << kHeader << " not enforced on target FCM version " - << shipping_fcm_version; - } - std::string error; - Level kernel_fcm_version = VintfObject::GetInstance()->getKernelLevel(&error); - ASSERT_NE(Level::UNSPECIFIED, kernel_fcm_version) - << kHeader << " must be specified for target FCM version '" - << shipping_fcm_version << "': " << error; - ASSERT_GE(kernel_fcm_version, shipping_fcm_version) - << kHeader << " is " << kernel_fcm_version - << ", but it must be greater or equal to target FCM version " - << shipping_fcm_version; -} - // Tests that deprecated HALs are not in the manifest, unless a higher, // non-deprecated minor version is in the manifest. TEST_F(DeviceManifestTest, NoDeprecatedHalsOnManifest) { diff --git a/usb/gadget/V1_1/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_1HostTest.java b/usb/gadget/V1_1/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_1HostTest.java index 4247d7f6..c8a848c8 100644 --- a/usb/gadget/V1_1/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_1HostTest.java +++ b/usb/gadget/V1_1/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_1HostTest.java @@ -54,7 +54,7 @@ public final class VtsHalUsbGadgetV1_1HostTest extends BaseHostJUnit4Test { testInfo.getDevice() .executeShellCommand(String.format("lshal | grep \"%s\"", HAL_SERVICE)) .trim(); - mHasService = !Strings.isNullOrEmpty(serviceFound); + mHasService = !Strings.isNullOrEmpty(serviceFound) && serviceFound.contains(HAL_SERVICE); } @Test |