Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
GKIComplianceTest: Account for running under a 32-bit userspace process
Allow dumpstate prop to R vendor's allowlist
Change-Id: Ifcabc42441af65fa2de276865040b9b95b5b72bf
diff --git a/avb/vts_gki_compliance_test.cpp b/avb/vts_gki_compliance_test.cpp
index 413043c..0a66bc7 100644
--- a/avb/vts_gki_compliance_test.cpp
+++ b/avb/vts_gki_compliance_test.cpp
@@ -399,9 +399,10 @@
product_first_api_level = GetProductFirstApiLevel();
- /* Skip for non arm64 that do not mandate GKI yet. */
- if (runtime_info->hardwareId() != "aarch64") {
- GTEST_SKIP() << "Exempt from GKI test on non-arm64 devices";
+ /* Skip for non-arm64 kernels that do not mandate GKI yet. */
+ if (runtime_info->hardwareId() != "aarch64" &&
+ runtime_info->hardwareId() != "armv8l") {
+ GTEST_SKIP() << "Exempt from GKI test on non-arm64 kernel devices";
}
/* Skip for form factors that do not mandate GKI yet */
diff --git a/system_property/VtsTrebleSysPropTest.py b/system_property/VtsTrebleSysPropTest.py
index 7f0b6ed..51bd514 100644
--- a/system_property/VtsTrebleSysPropTest.py
+++ b/system_property/VtsTrebleSysPropTest.py
@@ -87,7 +87,8 @@
]
_VENDOR_OR_ODM_NAMESPACES_WHITELIST = [
- "persist.camera." # b/138545066 remove this
+ "persist.camera.", # b/138545066 remove this
+ "persist.dumpstate.verbose_logging.enabled",
]
_VENDOR_TYPE_PREFIX = "vendor_"
diff --git a/system_property/vts_treble_sys_prop_test.py b/system_property/vts_treble_sys_prop_test.py
index adef97e..7622b2b 100644
--- a/system_property/vts_treble_sys_prop_test.py
+++ b/system_property/vts_treble_sys_prop_test.py
@@ -145,7 +145,8 @@
# This exception is allowed only for the devices launched before S
_VENDOR_OR_ODM_NAMESPACES_WHITELIST = [
- "persist.camera."
+ "persist.camera.",
+ "persist.dumpstate.verbose_logging.enabled",
]
_VENDOR_TYPE_PREFIX = "vendor_"