diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 17:32:59 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 17:32:59 +0000 |
commit | cd0139becdbd69d73fbdd1e20d6a0fa2e6f27df0 (patch) | |
tree | 8f28aa9bbee261df0934351bccfc4fa28fd49699 | |
parent | 072e3b490949c6184057d95fc8bb16e205bfe5ca (diff) | |
parent | 2a63e73a04cbf91a1dc04b924ace52a0c5b983bf (diff) | |
download | interfaces-aml_per_341711000.tar.gz |
Snap for 11508884 from 2a63e73a04cbf91a1dc04b924ace52a0c5b983bf to mainline-permission-releaseaml_per_341711000
Change-Id: Ib6e36d8a9da52c36b14a911c4f8bc5b78165ad9f
-rw-r--r-- | gnss/1.1/vts/functional/gnss_hal_test.cpp | 3 | ||||
-rw-r--r-- | security/keymint/aidl/vts/functional/AttestKeyTest.cpp | 4 | ||||
-rw-r--r-- | wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp | 33 |
3 files changed, 32 insertions, 8 deletions
diff --git a/gnss/1.1/vts/functional/gnss_hal_test.cpp b/gnss/1.1/vts/functional/gnss_hal_test.cpp index 6663a19abf..5ec980699f 100644 --- a/gnss/1.1/vts/functional/gnss_hal_test.cpp +++ b/gnss/1.1/vts/functional/gnss_hal_test.cpp @@ -168,8 +168,7 @@ bool GnssHalTest::IsGnssHalVersion_1_1() const { manager->listManifestByInterface( "android.hardware.gnss@1.1::IGnss", [&hasGnssHalVersion_1_1](const hidl_vec<hidl_string>& registered) { - ASSERT_EQ(1, registered.size()); - hasGnssHalVersion_1_1 = true; + hasGnssHalVersion_1_1 = registered.size() != 0; }); bool hasGnssHalVersion_2_0 = false; diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp index 6d289ecda8..4ae0383ef5 100644 --- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp +++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp @@ -939,7 +939,9 @@ TEST_P(AttestKeyTest, EcdsaAttestationMismatchID) { .Authorization(TAG_ATTESTATION_ID_MODEL, "malicious-model"); if (isSecondImeiIdAttestationRequired()) { - attestation_id_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, "invalid-second-imei"); + // Note: the invalid value here is < 16 bytes long to avoid triggering any implementation + // checks on valid IMEI lengths. + attestation_id_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, "invalid-imei2"); } vector<uint8_t> key_blob; vector<KeyCharacteristics> key_characteristics; diff --git a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp index fa7149ff55..e456e498c2 100644 --- a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp +++ b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp @@ -74,7 +74,17 @@ class WifiStaIfaceAidlTest : public testing::TestWithParam<std::string> { return testing::deviceSupportsFeature("com.google.android.tv.mdns_offload"); } - // Detected panel TV device by using ro.oem.key1 property. + bool doesDeviceSupportFullNetworkingUnder2w() { + return testing::deviceSupportsFeature("com.google.android.tv.full_networking_under_2w"); + } + + // Detect TV devices. + bool isTvDevice() { + return testing::deviceSupportsFeature("android.software.leanback") || + testing::deviceSupportsFeature("android.hardware.type.television"); + } + + // Detect Panel TV devices by using ro.oem.key1 property. // https://docs.partner.android.com/tv/build/platform/props-vars/ro-oem-key1 bool isPanelTvDevice() { const std::string oem_key1 = getPropertyString("ro.oem.key1"); @@ -135,10 +145,23 @@ TEST_P(WifiStaIfaceAidlTest, GetFeatureSet) { */ // @VsrTest = 5.3.12 TEST_P(WifiStaIfaceAidlTest, CheckApfIsSupported) { - // Flat panel TV devices that support MDNS offload do not have to implement APF if the WiFi - // chipset does not have sufficient RAM to do so. - if (isPanelTvDevice() && isMdnsOffloadPresentInNIC()) { - GTEST_SKIP() << "Panel TV supports mDNS offload. It is not required to support APF"; + const std::string oem_key1 = getPropertyString("ro.oem.key1"); + if (isTvDevice()) { + // Flat panel TV devices that support MDNS offload do not have to implement APF if the WiFi + // chipset does not have sufficient RAM to do so. + if (isPanelTvDevice() && isMdnsOffloadPresentInNIC()) { + GTEST_SKIP() << "Panel TV supports mDNS offload. It is not required to support APF"; + } + // For TV devices declaring the + // com.google.android.tv.full_networking_under_2w feature, this indicates + // the device can meet the <= 2W standby power requirement while + // continuously processing network packets on the CPU, even in standby mode. + // In these cases, APF support is strongly recommended rather than being + // mandatory. + if (doesDeviceSupportFullNetworkingUnder2w()) { + GTEST_SKIP() << "TV Device meets the <= 2W standby power demand requirement. It is not " + "required to support APF."; + } } int vendor_api_level = property_get_int32("ro.vendor.api_level", 0); // Before VSR 14, APF support is optional. |