diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-30 01:46:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-30 01:46:02 +0000 |
| commit | 5bb7be6712e6d51a5b9177443215e482ff37393b (patch) | |
| tree | 9f1c3780404cb7d27c49e9fe6319752150ba0e7d | |
| parent | fbc673cc4a8f46e76fc3f9071cb435a34abe6a3f (diff) | |
| parent | aa50b7e6c36741337d4b610de6fe1c6cfd98df5b (diff) | |
| download | platform_test_vts-testcase_security-android11-gsi.tar.gz platform_test_vts-testcase_security-android11-gsi.tar.bz2 platform_test_vts-testcase_security-android11-gsi.zip | |
Snap for 6542686 from 33b69620be1eee427cf8858699bc99e288e25fa2 to rvc-release am: aa50b7e6c3android11-gsi
Change-Id: I897710d794bdd6a9f3410ca65395340739b0591e
| -rw-r--r-- | system_property/VtsTrebleSysPropTest.py | 3 | ||||
| -rw-r--r-- | system_property/vts_treble_sys_prop_test.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/system_property/VtsTrebleSysPropTest.py b/system_property/VtsTrebleSysPropTest.py index 6480488..c998c42 100644 --- a/system_property/VtsTrebleSysPropTest.py +++ b/system_property/VtsTrebleSysPropTest.py @@ -96,7 +96,8 @@ class VtsTrebleSysPropTest(base_test.BaseTestClass): _SYSTEM_WHITELISTED_TYPES = [ "vendor_default_prop", - "vendor_security_patch_level_prop" + "vendor_security_patch_level_prop", + "vendor_socket_hook_prop" ] _VENDOR_OR_ODM_WHITELISTED_TYPES = [ diff --git a/system_property/vts_treble_sys_prop_test.py b/system_property/vts_treble_sys_prop_test.py index 6e27abe..800599b 100644 --- a/system_property/vts_treble_sys_prop_test.py +++ b/system_property/vts_treble_sys_prop_test.py @@ -153,7 +153,8 @@ class VtsTrebleSysPropTest(unittest.TestCase): _SYSTEM_WHITELISTED_TYPES = [ "vendor_default_prop", - "vendor_security_patch_level_prop" + "vendor_security_patch_level_prop", + "vendor_socket_hook_prop" ] _VENDOR_OR_ODM_WHITELISTED_TYPES = [ @@ -371,6 +372,7 @@ class VtsTrebleSysPropTest(unittest.TestCase): if (not self.dut.Exists(self._ODM_PROPERTY_CONTEXTS_FILE_PATH)): logging.info("Skip test for a device which doesn't have an odm " "property contexts.") + return self._TestPropertyTypes( self._ODM_PROPERTY_CONTEXTS_FILE_PATH, lambda typename: typename.startswith(self._VENDOR_TYPE_PREFIX) or |