Skip to content
Snippets Groups Projects
Commit 15a9fbc2 authored by Max Bires's avatar Max Bires Committed by android-build-merger
Browse files

Adding labeling for vendor security patch prop am: 5cac1aa9

am: ad3602d2

Change-Id: I034f2f2c9eab3667cfa92ea41b4b5f4afa1c7df7
parents c16e920d ad3602d2
No related branches found
No related tags found
No related merge requests found
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
untrusted_app_all_devpts untrusted_app_all_devpts
update_engine_log_data_file update_engine_log_data_file
vendor_default_prop vendor_default_prop
vendor_security_patch_level_prop
usbd usbd
usbd_exec usbd_exec
usbd_tmpfs usbd_tmpfs
......
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
usbd_tmpfs usbd_tmpfs
vendor_default_prop vendor_default_prop
vendor_init vendor_init
vendor_security_patch_level_prop
vendor_shell vendor_shell
vold_metadata_file vold_metadata_file
vold_prepare_subdirs vold_prepare_subdirs
......
...@@ -53,6 +53,7 @@ type system_radio_prop, property_type, core_property_type; ...@@ -53,6 +53,7 @@ type system_radio_prop, property_type, core_property_type;
type vold_prop, property_type, core_property_type; type vold_prop, property_type, core_property_type;
type wifi_log_prop, property_type, log_property_type; type wifi_log_prop, property_type, log_property_type;
type wifi_prop, property_type; type wifi_prop, property_type;
type vendor_security_patch_level_prop, property_type;
# Properties for whitelisting # Properties for whitelisting
type exported_config_prop, property_type; type exported_config_prop, property_type;
......
...@@ -102,6 +102,7 @@ ro.telephony.default_cdma_sub u:object_r:exported3_default_prop:s0 exact int ...@@ -102,6 +102,7 @@ ro.telephony.default_cdma_sub u:object_r:exported3_default_prop:s0 exact int
ro.telephony.default_network u:object_r:exported3_default_prop:s0 exact int ro.telephony.default_network u:object_r:exported3_default_prop:s0 exact int
ro.url.legal u:object_r:exported3_default_prop:s0 exact string ro.url.legal u:object_r:exported3_default_prop:s0 exact string
ro.url.legal.android_privacy u:object_r:exported3_default_prop:s0 exact string ro.url.legal.android_privacy u:object_r:exported3_default_prop:s0 exact string
ro.vendor.build.security_patch u:object_r:vendor_security_patch_level_prop:s0 exact string
ro.zygote u:object_r:exported3_default_prop:s0 exact string ro.zygote u:object_r:exported3_default_prop:s0 exact string
sendbug.preferred.domain u:object_r:exported3_default_prop:s0 exact string sendbug.preferred.domain u:object_r:exported3_default_prop:s0 exact string
sys.usb.controller u:object_r:exported2_system_prop:s0 exact string sys.usb.controller u:object_r:exported2_system_prop:s0 exact string
......
...@@ -81,6 +81,9 @@ userdebug_or_eng(` ...@@ -81,6 +81,9 @@ userdebug_or_eng(`
# Read device's serial number from system properties # Read device's serial number from system properties
get_prop(shell, serialno_prop) get_prop(shell, serialno_prop)
# Allow shell to read the vendor security patch level for CTS
get_prop(shell, vendor_security_patch_level_prop)
# Read state of logging-related properties # Read state of logging-related properties
get_prop(shell, device_logging_prop) get_prop(shell, device_logging_prop)
......
...@@ -178,6 +178,7 @@ set_prop(vendor_init, log_tag_prop) ...@@ -178,6 +178,7 @@ set_prop(vendor_init, log_tag_prop)
set_prop(vendor_init, log_prop) set_prop(vendor_init, log_prop)
set_prop(vendor_init, serialno_prop) set_prop(vendor_init, serialno_prop)
set_prop(vendor_init, vendor_default_prop) set_prop(vendor_init, vendor_default_prop)
set_prop(vendor_init, vendor_security_patch_level_prop)
set_prop(vendor_init, wifi_log_prop) set_prop(vendor_init, wifi_log_prop)
get_prop(vendor_init, exported2_radio_prop) get_prop(vendor_init, exported2_radio_prop)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment