commit 951bf93ad8941b7e2848b82dac92b8f75c13b279
author Jooyung Han <jooyung@google.com> Sat Jul 17 03:46:58 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 17 03:46:58 2021 +0000
tree c775c54827eca88578b25fa3a430a15e3dae9ca0
parent 9daeadb31e81960e0fb3012df1a9d2bddf863a88
parent 6d4179a66ee5231c1cfa63109e573013b480e1eb

Merge "Fix virtualizationservice rules"

private/compat/31.0/31.0.ignore.cil

diff --git a/private/compat/31.0/31.0.ignore.cil b/private/compat/31.0/31.0.ignore.cil
index 9cb5c92..c2ffde0 100644
--- a/private/compat/31.0/31.0.ignore.cil
+++ b/private/compat/31.0/31.0.ignore.cil
@@ -8,6 +8,7 @@
     artd_service
     camera2_extensions_prop
     power_stats_service
+    tare_service
     transformer_service
     proc_watermark_boost_factor
     untrusted_app_30

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index 8741fbe..fa5389d 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -516,6 +516,7 @@
 ro.lmk.critical_upgrade         u:object_r:lmkd_config_prop:s0 exact bool
 ro.lmk.debug                    u:object_r:lmkd_config_prop:s0 exact bool
 ro.lmk.downgrade_pressure       u:object_r:lmkd_config_prop:s0 exact int
+ro.lmk.filecache_min_kb         u:object_r:lmkd_config_prop:s0 exact int
 ro.lmk.kill_heaviest_task       u:object_r:lmkd_config_prop:s0 exact bool
 ro.lmk.kill_timeout_ms          u:object_r:lmkd_config_prop:s0 exact int
 ro.lmk.log_stats                u:object_r:lmkd_config_prop:s0 exact bool

private/service_contexts

diff --git a/private/service_contexts b/private/service_contexts
index f8c1607..6c8c83e 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -262,6 +262,7 @@
 system_config                             u:object_r:system_config_service:s0
 system_server_dumper                      u:object_r:system_server_dumper_service:s0
 system_update                             u:object_r:system_update_service:s0
+tare                                      u:object_r:tare_service:s0
 task                                      u:object_r:task_service:s0
 telecom                                   u:object_r:telecom_service:s0
 telephony.registry                        u:object_r:registry_service:s0

public/service.te

diff --git a/public/service.te b/public/service.te
index 756c31c..5e94477 100644
--- a/public/service.te
+++ b/public/service.te
@@ -203,6 +203,7 @@
 type system_update_service, system_server_service, service_manager_type;
 type soundtrigger_middleware_service, system_server_service, service_manager_type;
 type speech_recognition_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
+type tare_service, app_api_service, system_server_service, service_manager_type;
 type task_service, system_server_service, service_manager_type;
 type testharness_service, system_server_service, service_manager_type;
 type textclassification_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;