commit 490cbfdbd338286e007d5b5a08a9daba6f342bf4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 18 05:34:20 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 18 05:34:20 2018 +0000
tree f37ca6b049bb4702772fa21b7482be5bfd0a1c8b
parent ac1a0a7bf5ba75548ab3d4b58fa7c31cc03b4522
parent 404e40c6c10cd8da7d08537ed531fe5fecb2289b

Merge "Use hidl memory from allocator in CAS"

private/compat/28.0/28.0.ignore.cil

diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index 1b07deb..222f381 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -19,6 +19,7 @@
     apexd_tmpfs
     biometric_service
     content_capture_service
+    content_suggestions_service
     cpu_variant_prop
     dev_cpu_variant
     device_config_boot_count_prop

private/service_contexts

diff --git a/private/service_contexts b/private/service_contexts
index 9fe7855..c90f93b 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -33,6 +33,7 @@
 consumer_ir                               u:object_r:consumer_ir_service:s0
 content                                   u:object_r:content_service:s0
 content_capture                           u:object_r:content_capture_service:s0
+content_suggestions                       u:object_r:content_suggestions_service:s0
 contexthub                                u:object_r:contexthub_service:s0
 country_detector                          u:object_r:country_detector_service:s0
 coverage                                  u:object_r:coverage_service:s0

public/service.te

diff --git a/public/service.te b/public/service.te
index c244c0c..cf98261 100644
--- a/public/service.te
+++ b/public/service.te
@@ -66,6 +66,7 @@
 type connmetrics_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type consumer_ir_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type content_capture_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
+type content_suggestions_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type content_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type country_detector_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 # Note: The coverage_service should only be enabled for userdebug / eng builds that were compiled