Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Change-Id: I7bb725d7fa395503cc0ff728c22ad5e673d554d4
diff --git a/system_property/VtsTrebleSysPropTest.py b/system_property/VtsTrebleSysPropTest.py
index 0bdc9a0..c42b764 100644
--- a/system_property/VtsTrebleSysPropTest.py
+++ b/system_property/VtsTrebleSysPropTest.py
@@ -42,8 +42,11 @@
contexts file.
_ODM_PROPERTY_CONTEXTS_FILE_PATH: The path of odm property
contexts file.
- _VENDOR_OR_ODM_NAMESPACES: The namepsaces allowed for vendor/odm
- properties.
+ _VENDOR_OR_ODM_NAMESPACES: The namespaces allowed for vendor/odm
+ properties.
+
+ _VENDOR_OR_ODM_NAMESPACES_WHITELIST: The extra namespaces allowed for
+ vendor/odm properties.
"""
_PUBLIC_PROPERTY_CONTEXTS_FILE_PATH = ("vts/testcases/security/"
@@ -72,6 +75,10 @@
"vendor."
]
+ _VENDOR_OR_ODM_NAMESPACES_WHITELIST = [
+ "persist.camera." # b/138545066 remove this
+ ]
+
def setUpClass(self):
"""Initializes tests.
@@ -142,8 +149,8 @@
len(property_dict), partition)
violation_list = filter(
lambda x: not any(
- x.startswith(prefix)
- for prefix in self._VENDOR_OR_ODM_NAMESPACES),
+ x.startswith(prefix) for prefix in
+ self._VENDOR_OR_ODM_NAMESPACES + self._VENDOR_OR_ODM_NAMESPACES_WHITELIST),
property_dict.keys())
asserts.assertEqual(
len(violation_list), 0,