diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-29 07:11:13 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-29 07:11:13 +0000 |
| commit | 88c9e596f7025dcd9b306e2aa24f39e25bad5907 (patch) | |
| tree | 9f1c3780404cb7d27c49e9fe6319752150ba0e7d | |
| parent | 646443c5b5796a4c866ba6e35d67c8210e3e3c68 (diff) | |
| parent | 1e17d60a27eba2be4cb655a5756d6ddecf2e50a6 (diff) | |
| download | platform_test_vts-testcase_security-android11-mainline-release.tar.gz platform_test_vts-testcase_security-android11-mainline-release.tar.bz2 platform_test_vts-testcase_security-android11-mainline-release.zip | |
Snap for 6539570 from 1e17d60a27eba2be4cb655a5756d6ddecf2e50a6 to mainline-releaseandroid-mainline-11.0.0_r1android11-mainline-release
Change-Id: I5af29f8dd1855018658404c9208caed189b411d0
| -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 |