sync codebase to master
Bug: 193476758
Test: build pass
Change-Id: Ic2e45d4f989ee09418c563a69075d69f730876ea
Merged-In: I8a83a549a6c0cf8dd174c52b8377e3bd5dcbea37
diff --git a/flipendo/flipendo.te b/flipendo/flipendo.te
index a147885..1091ce8 100644
--- a/flipendo/flipendo.te
+++ b/flipendo/flipendo.te
@@ -2,7 +2,7 @@
app_domain(flipendo)
-# Access to Westworld logging service
+# Access to ISstats service to log atoms
allow flipendo fwk_stats_service:service_manager find;
binder_use(flipendo)
diff --git a/mm/gki/file.te b/mm/gki/file.te
index d0e1b64..9970f78 100644
--- a/mm/gki/file.te
+++ b/mm/gki/file.te
@@ -1,5 +1,4 @@
type mm_logd_vendor_data_file, file_type, data_file_type;
type debugfs_page_owner, debugfs_type, fs_type;
-type proc_watermark_boost_factor, fs_type, proc_type;
type proc_min_free_kbytes, fs_type, proc_type;
type proc_lowmem_reserve_ratio, fs_type, proc_type;
diff --git a/mm/gki/genfs_contexts b/mm/gki/genfs_contexts
index 957a343..852bc3e 100644
--- a/mm/gki/genfs_contexts
+++ b/mm/gki/genfs_contexts
@@ -1,4 +1,3 @@
genfscon debugfs /page_owner u:object_r:debugfs_page_owner:s0
-genfscon proc /sys/vm/watermark_boost_factor u:object_r:proc_watermark_boost_factor:s0
genfscon proc /sys/vm/lowmem_reserve_ratio u:object_r:proc_watermark_boost_factor:s0
genfscon proc /sys/vm/min_free_kbytes u:object_r:proc_watermark_boost_factor:s0
diff --git a/ramdump/common/file.te b/ramdump/common/file.te
index 78ad1db..93b947f 100644
--- a/ramdump/common/file.te
+++ b/ramdump/common/file.te
@@ -1,3 +1,3 @@
type ramdump_vendor_data_file, file_type, data_file_type, mlstrustedobject;
type ramdump_vendor_mnt_file, file_type, data_file_type, mlstrustedobject;
-type ramdump_vendor_fs, file_type, data_file_type, mlstrustedobject;
+type ramdump_vendor_fs, fusefs_type, data_file_type, mlstrustedobject;
