| commit | cb1ca01e1dfae39874bceaba297b07d5bb27aaec | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Fri May 13 02:05:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 13 02:05:17 2022 +0000 |
| tree | 16022a61077ef4fb619d89f5240d7a2bc0077f9d | |
| parent | 4577ca6756ba9fdf7c02a8849bf67376148dc5ac [diff] | |
| parent | f28026f3299a9372f6d332cae0dbdc710ca11a0c [diff] |
[conflict] Allow dumpstate prop to R vendor's allowlist am: a8e1303bdb am: f28026f329 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/security/+/2097397 Change-Id: I919975b560c3fecbb85e9c419f252779023c83d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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_"