commit 4fb66f04d73b489dbf8683a3d129355df0809c6d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 26 22:23:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 26 22:23:13 2021 +0000
tree 0c7f425af46619184fd2cf1a73e4c323de46b2f8
parent 7a7c41b3bcd10cdf5c7699f2812abd5e4aebad21
parent 4cead73a863ec71342f1309c8b897f39e639ff2a

Merge "Add sepolicy for app hibernation system service"

private/compat/30.0/30.0.ignore.cil

diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 57ffc45..9db6e48 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -11,6 +11,7 @@
     apex_art_data_file
     apex_art_staging_data_file
     apex_info_file
+    app_hibernation_service
     arm64_memtag_prop
     authorization_service
     cgroup_desc_api_file

private/service_contexts

diff --git a/private/service_contexts b/private/service_contexts
index 494644a..5369b54 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -34,6 +34,7 @@
 android.service.gatekeeper.IGateKeeperService    u:object_r:gatekeeper_service:s0
 android.system.keystore2                  u:object_r:keystore_service:s0
 app_binding                               u:object_r:app_binding_service:s0
+app_hibernation                           u:object_r:app_hibernation_service:s0
 app_integrity                             u:object_r:app_integrity_service:s0
 app_prediction                            u:object_r:app_prediction_service:s0
 app_search                                u:object_r:app_search_service:s0

public/service.te

diff --git a/public/service.te b/public/service.te
index a2bb54b..87d9bcd 100644
--- a/public/service.te
+++ b/public/service.te
@@ -51,6 +51,7 @@
 type adb_service, system_api_service, system_server_service, service_manager_type;
 type alarm_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type app_binding_service, system_server_service, service_manager_type;
+type app_hibernation_service, system_api_service, system_server_service, service_manager_type;
 type app_integrity_service, system_api_service, system_server_service, service_manager_type;
 type app_prediction_service, app_api_service, system_server_service, service_manager_type;
 type app_search_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;