Merge "selinux: set proc_uid_time_in_state type for /proc/uid"

am: 33ba9c54

Change-Id: I09d49857f0bffc37090c4429879fb5288cbc9b90

private/genfs_contexts

@@ -68,6 +68,7 @@ genfscon proc /sys/vm/overcommit_memory u:object_r:proc_overcommit_memory:s0
 genfscon proc /timer_list u:object_r:proc_timer:s0
 genfscon proc /timer_stats u:object_r:proc_timer:s0
 genfscon proc /tty/drivers u:object_r:proc_tty_drivers:s0
+genfscon proc /uid/ u:object_r:proc_uid_time_in_state:s0
 genfscon proc /uid_cputime/show_uid_stat u:object_r:proc_uid_cputime_showstat:s0
 genfscon proc /uid_cputime/remove_uid_range u:object_r:proc_uid_cputime_removeuid:s0
 genfscon proc /uid_io/stats u:object_r:proc_uid_io_stats:s0

private/system_server.te

@@ -698,6 +698,8 @@ allow system_server {
   proc_vmallocinfo
 }:file r_file_perms;
 
+allow system_server proc_uid_time_in_state:dir r_dir_perms;
+
 r_dir_file(system_server, rootfs)
 
 ### Rules needed when Light HAL runs inside system_server process.