tequilaOS/platform_system_sepolicy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am: d27aee3322 am: e028be05dc

Browse source 
am: e5f67cb590

Change-Id: Ie63a32a1b78c63db64a9a3e041c23e0b5953734e
This commit is contained in:
Mark Salyzyn 2017-08-25 14:47:56 +00:00 committed by android-build-merger
commit 5249c4277b
9 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
private/file_contexts
View file

@ -373,7 +373,6 @@
/data/misc/logd(/.*)? u:object_r:misc_logd_file:s0
/data/misc/media(/.*)? u:object_r:media_data_file:s0
/data/misc/net(/.*)? u:object_r:net_data_file:s0
/data/misc/reboot(/.*)? u:object_r:reboot_data_file:s0
/data/misc/recovery(/.*)? u:object_r:recovery_data_file:s0
/data/misc/shared_relro(/.*)? u:object_r:shared_relro_file:s0
/data/misc/sms(/.*)? u:object_r:radio_data_file:s0

3
private/property_contexts
View file

@ -65,6 +65,9 @@ ro.serialno u:object_r:serialno_prop:s0
ro.boot.btmacaddr u:object_r:bluetooth_prop:s0
ro.boot.serialno u:object_r:serialno_prop:s0
ro.bt. u:object_r:bluetooth_prop:s0
ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0
persist.sys.boot.reason u:object_r:last_boot_reason_prop:s0
sys.boot.reason u:object_r:system_boot_reason_prop:s0
# Boolean property set by system server upon boot indicating
# if device owner is provisioned.

9
private/system_server.te
View file

@ -29,10 +29,6 @@ allow system_server resourcecache_data_file:dir r_dir_perms;
# ptrace to processes in the same domain for debugging crashes.
allow system_server self:process ptrace;
# Read and delete last_reboot_reason file
allow system_server reboot_data_file:file { rename r_file_perms unlink };
allow system_server reboot_data_file:dir { write search open remove_name };
# Child of the zygote.
allow system_server zygote:fd use;
allow system_server zygote:process sigchld;
@ -480,6 +476,11 @@ set_prop(system_server, ctl_bugreport_prop)
# cppreopt property
set_prop(system_server, cppreopt_prop)
# BootReceiver to read ro.boot.bootreason
get_prop(system_server, bootloader_boot_reason_prop)
# PowerManager to read persist.sys.boot.reason
get_prop(system_server, last_boot_reason_prop)
# Collect metrics on boot time created by init
get_prop(system_server, boottime_prop)

4
public/bootanim.te
View file

@ -39,3 +39,7 @@ r_dir_file(bootanim, cgroup)
# System file accesses.
allow bootanim system_file:dir r_dir_perms;
# Read ro.boot.bootreason b/30654343
get_prop(bootanim, bootloader_boot_reason_prop)

3
public/bootstat.te
View file

@ -13,3 +13,6 @@ r_dir_file(bootstat, proc)
# Collect metrics on boot time created by init
get_prop(bootstat, boottime_prop)
# Read ro.boot.bootreason
get_prop(bootstat, bootloader_boot_reason_prop)

5
public/dumpstate.te
View file

@ -201,6 +201,11 @@ get_prop(dumpstate, serialno_prop)
# Read state of logging-related properties
get_prop(dumpstate, device_logging_prop)
# Read state of boot reason properties
get_prop(dumpstate, bootloader_boot_reason_prop)
get_prop(dumpstate, last_boot_reason_prop)
get_prop(dumpstate, system_boot_reason_prop)
# Access to /data/media.
# This should be removed if sdcardfs is modified to alter the secontext for its
# accesses to the underlying FS.

3
public/property.te
View file

@ -1,6 +1,7 @@
type audio_prop, property_type, core_property_type;
type boottime_prop, property_type;
type bluetooth_prop, property_type;
type bootloader_boot_reason_prop, property_type;
type config_prop, property_type, core_property_type;
type cppreopt_prop, property_type, core_property_type;
type ctl_bootanim_prop, property_type;
@ -23,6 +24,7 @@ type ffs_prop, property_type, core_property_type;
type fingerprint_prop, property_type, core_property_type;
type firstboot_prop, property_type;
type hwservicemanager_prop, property_type;
type last_boot_reason_prop, property_type;
type logd_prop, property_type, core_property_type;
type logpersistd_logging_prop, property_type;
type log_prop, property_type, log_property_type;
@ -42,6 +44,7 @@ type restorecon_prop, property_type, core_property_type;
type safemode_prop, property_type;
type serialno_prop, property_type;
type shell_prop, property_type, core_property_type;
type system_boot_reason_prop, property_type;
type system_prop, property_type, core_property_type;
type system_radio_prop, property_type, core_property_type;
type vold_prop, property_type, core_property_type;

3
public/recovery.te
View file

@ -118,6 +118,9 @@ recovery_only(`
# Set sys.usb.ffs.ready when starting minadbd for sideload.
set_prop(recovery, ffs_prop)
# Read ro.boot.bootreason
get_prop(recovery, bootloader_boot_reason_prop)
# Use setfscreatecon() to label files for OTA updates.
allow recovery self:process setfscreate;

5
public/shell.te
View file

@ -79,6 +79,11 @@ get_prop(shell, serialno_prop)
# Read state of logging-related properties
get_prop(shell, device_logging_prop)
# Read state of boot reason properties
get_prop(shell, bootloader_boot_reason_prop)
get_prop(shell, last_boot_reason_prop)
get_prop(shell, system_boot_reason_prop)
# allow shell access to services
allow shell servicemanager:service_manager list;
# don't allow shell to access GateKeeper service