Merge "Revert^2 "Add pm.archiving.enabled system property"" into main
diff --git a/contexts/plat_file_contexts_test b/contexts/plat_file_contexts_test
index 8af0fda..f403f8b 100644
--- a/contexts/plat_file_contexts_test
+++ b/contexts/plat_file_contexts_test
@@ -1234,6 +1234,8 @@
/metadata/aconfig/flags/test aconfig_storage_flags_metadata_file
/metadata/aconfig/boot aconfig_storage_metadata_file
/metadata/aconfig/boot/test aconfig_storage_metadata_file
+/metadata/aconfig_test_missions aconfig_test_mission_files
+/metadata/aconfig_test_missions/test aconfig_test_mission_files
/metadata/apex apex_metadata_file
/metadata/apex/test apex_metadata_file
/metadata/vold vold_metadata_file
diff --git a/private/compat/202404/202404.ignore.cil b/private/compat/202404/202404.ignore.cil
index 90f09e8..a0a69f7 100644
--- a/private/compat/202404/202404.ignore.cil
+++ b/private/compat/202404/202404.ignore.cil
@@ -9,4 +9,5 @@
fs_bpf_lmkd_memevents_rb
fs_bpf_lmkd_memevents_prog
binderfs_logs_transactions
+ proc_compaction_proactiveness
))
diff --git a/private/domain.te b/private/domain.te
index bac2a7e..da52d5f 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -562,6 +562,7 @@
# that records where flag storage files are, so also needs to be readable by everbody.
r_dir_file({ coredomain appdomain }, aconfig_storage_metadata_file);
r_dir_file({ coredomain appdomain }, system_aconfig_storage_file);
+r_dir_file({ coredomain appdomain }, aconfig_test_mission_files);
# processes needs to access storage file stored at /metadata/aconfig/boot, require search
# permission on /metadata dir
diff --git a/private/file.te b/private/file.te
index 5295f69..b96e18b 100644
--- a/private/file.te
+++ b/private/file.te
@@ -156,6 +156,8 @@
# Type for /vendor/etc/aconfig
type vendor_aconfig_storage_file, vendor_file_type, file_type;
+type aconfig_test_mission_files, file_type;
+
# /data/misc/connectivityblobdb
type connectivityblob_data_file, file_type, data_file_type, core_data_file_type;
diff --git a/private/file_contexts b/private/file_contexts
index 567f30d..b209109 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -872,6 +872,7 @@
/metadata/repair-mode(/.*)? u:object_r:repair_mode_metadata_file:s0
/metadata/aconfig(/.*)? u:object_r:aconfig_storage_metadata_file:s0
/metadata/aconfig/flags(/.*)? u:object_r:aconfig_storage_flags_metadata_file:s0
+/metadata/aconfig_test_missions(/.*)? u:object_r:aconfig_test_mission_files:s0
#############################
# asec containers
diff --git a/private/genfs_contexts b/private/genfs_contexts
index b6b18c0..dd93f04 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -93,6 +93,7 @@
genfscon proc /sys/vm/watermark_boost_factor u:object_r:proc_watermark_boost_factor:s0
genfscon proc /sys/vm/watermark_scale_factor u:object_r:proc_watermark_scale_factor:s0
genfscon proc /sys/vm/percpu_pagelist_high_fraction u:object_r:proc_percpu_pagelist_high_fraction:s0
+genfscon proc /sys/vm/compaction_proactiveness u:object_r:proc_compaction_proactiveness: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
diff --git a/private/system_server.te b/private/system_server.te
index f6ae092..8ed485a 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -1493,6 +1493,9 @@
allow system_server aconfig_storage_flags_metadata_file:file create_file_perms;
allow system_server aconfig_storage_metadata_file:dir search;
+allow system_server aconfig_test_mission_files:dir create_dir_perms;
+allow system_server aconfig_test_mission_files:file create_file_perms;
+
allow system_server repair_mode_metadata_file:dir rw_dir_perms;
allow system_server repair_mode_metadata_file:file create_file_perms;
diff --git a/public/file.te b/public/file.te
index b25175b..4700ded 100644
--- a/public/file.te
+++ b/public/file.te
@@ -18,6 +18,7 @@
type proc_kpageflags, fs_type, proc_type;
type proc_watermark_boost_factor, fs_type, proc_type;
type proc_percpu_pagelist_high_fraction, fs_type, proc_type;
+type proc_compaction_proactiveness, fs_type, proc_type;
# proc, sysfs, or other nodes that permit configuration of kernel usermodehelpers.
type usermodehelper, fs_type, proc_type;
type sysfs_usermodehelper, fs_type, sysfs_type;