Revert "Add placeholder iris and face policy for vold data directory"

This reverts commit 92bde4b941.

Reason for revert: Rebooting after OTA fails due to the
filesystem still seeing the old label on the device.

Bug: 116528212
Bug: 119747564
Change-Id: Ib5f920f85c7e305e89c377369dca038d2c6c738c
Test: rollback change
This commit is contained in:
Nick Kralevich 2018-11-19 18:42:11 +00:00
parent 41ddb80cd8
commit 83f25e26f9
7 changed files with 10 additions and 18 deletions

View file

@ -3,7 +3,6 @@
(type audio_timer_device)
(type commontime_management_service)
(type cpuctl_device)
(type fingerprint_vendor_data_file)
(type full_device)
(type i2c_device)
(type kmem_device)
@ -1075,7 +1074,7 @@
(typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
(typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
(typeattributeset fingerprint_service_28_0 (fingerprint_service))
(typeattributeset fingerprint_vendor_data_file_28_0 (biometric_vendor_data_file))
(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
(typeattributeset firstboot_prop_28_0 (firstboot_prop))
(typeattributeset font_service_28_0 (font_service))
(typeattributeset frp_block_device_28_0 (frp_block_device))

View file

@ -17,7 +17,6 @@
apexd_prop
apexd_tmpfs
biometric_service
biometric_vendor_data_file
cpu_variant_prop
dev_cpu_variant
device_config_boot_count_prop

View file

@ -482,13 +482,7 @@
/data/system/users/[0-9]+/fpdata(/.*)? u:object_r:fingerprintd_data_file:s0
# Fingerprint vendor data file
/data/vendor_de/[0-9]+/fpdata(/.*)? u:object_r:biometric_vendor_data_file:s0
# Face vendor data file
/data/vendor_de/[0-9]+/facedata(/.*)? u:object_r:biometric_vendor_data_file:s0
# Iris vendor data file
/data/vendor_de/[0-9]+/irisdata(/.*)? u:object_r:biometric_vendor_data_file:s0
/data/vendor_de/[0-9]+/fpdata(/.*)? u:object_r:fingerprint_vendor_data_file:s0
# Bootchart data
/data/bootchart(/.*)? u:object_r:bootchart_data_file:s0

View file

@ -14,12 +14,12 @@ allow vold_prepare_subdirs {
vendor_data_file
}:dir { open read write add_name remove_name rmdir relabelfrom };
allow vold_prepare_subdirs {
biometric_vendor_data_file
fingerprint_vendor_data_file
storaged_data_file
vold_data_file
}:dir { create_dir_perms relabelto };
allow vold_prepare_subdirs {
biometric_vendor_data_file
fingerprint_vendor_data_file
storaged_data_file
system_data_file
vold_data_file

View file

@ -354,8 +354,8 @@ type backup_data_file, file_type, data_file_type, core_data_file_type, mlstruste
type bluetooth_efs_file, file_type;
# Type for fingerprint template file
type fingerprintd_data_file, file_type, data_file_type, core_data_file_type;
# Type for biometric template file
type biometric_vendor_data_file, file_type, data_file_type;
# Type for _new_ fingerprint template file
type fingerprint_vendor_data_file, file_type, data_file_type;
# Type for appfuse file.
type app_fuse_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;

View file

@ -7,8 +7,8 @@ hal_attribute_hwservice(hal_fingerprint, hal_fingerprint_hwservice)
# For memory allocation
allow hal_fingerprint ion_device:chr_file r_file_perms;
allow hal_fingerprint biometric_vendor_data_file:file { create_file_perms };
allow hal_fingerprint biometric_vendor_data_file:dir rw_dir_perms;
allow hal_fingerprint fingerprint_vendor_data_file:file { create_file_perms };
allow hal_fingerprint fingerprint_vendor_data_file:dir rw_dir_perms;
r_dir_file(hal_fingerprint, cgroup)
r_dir_file(hal_fingerprint, sysfs)

View file

@ -6,6 +6,6 @@ type tee, domain;
# Device(s) for communicating with the TEE
type tee_device, dev_type;
allow tee biometric_vendor_data_file:dir rw_dir_perms;
allow tee biometric_vendor_data_file:file create_file_perms;
allow tee fingerprint_vendor_data_file:dir rw_dir_perms;
allow tee fingerprint_vendor_data_file:file create_file_perms;