Merge "Add property for enabling stereo spatialization" into main
diff --git a/build/soong/service_fuzzer_bindings.go b/build/soong/service_fuzzer_bindings.go
index 7f1f0be..31c6bf1 100644
--- a/build/soong/service_fuzzer_bindings.go
+++ b/build/soong/service_fuzzer_bindings.go
@@ -234,6 +234,7 @@
"content_capture": EXCEPTION_NO_FUZZER,
"content_suggestions": EXCEPTION_NO_FUZZER,
"contexthub": EXCEPTION_NO_FUZZER,
+ "contextual_search": EXCEPTION_NO_FUZZER,
"country_detector": EXCEPTION_NO_FUZZER,
"coverage": EXCEPTION_NO_FUZZER,
"cpuinfo": EXCEPTION_NO_FUZZER,
diff --git a/private/compat/34.0/34.0.ignore.cil b/private/compat/34.0/34.0.ignore.cil
index 0ae0076..e19da6c 100644
--- a/private/compat/34.0/34.0.ignore.cil
+++ b/private/compat/34.0/34.0.ignore.cil
@@ -6,6 +6,7 @@
(typeattributeset new_objects
( new_objects
archive_service
+ contextual_search_service
dtbo_block_device
ota_build_prop
snapuserd_log_data_file
diff --git a/private/property_contexts b/private/property_contexts
index e0cbb4d..c5f679e 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -1155,7 +1155,7 @@
ro.board.first_api_level u:object_r:build_vendor_prop:s0 exact int
ro.board.api_level u:object_r:build_vendor_prop:s0 exact int
ro.board.api_frozen u:object_r:build_vendor_prop:s0 exact bool
-ro.llndk.api_level u:object_r:build_vendor_prop:s0 exact int
+ro.llndk.api_level u:object_r:build_prop:s0 exact int
ro.vendor.api_level u:object_r:build_vendor_prop:s0 exact int
# Boot image build props set by /{second_stage_resources/,}boot/etc/build.prop
diff --git a/private/service_contexts b/private/service_contexts
index 863ffde..5099097 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -214,6 +214,7 @@
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
+contextual_search u:object_r:contextual_search_service:s0
country_detector u:object_r:country_detector_service:s0
coverage u:object_r:coverage_service:s0
cpuinfo u:object_r:cpuinfo_service:s0
diff --git a/public/service.te b/public/service.te
index 0097d17..a221956 100644
--- a/public/service.te
+++ b/public/service.te
@@ -89,6 +89,7 @@
type clipboard_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type cloudsearch_service, app_api_service, system_server_service, service_manager_type;
type contexthub_service, app_api_service, system_server_service, service_manager_type;
+type contextual_search_service, app_api_service, system_server_service, service_manager_type;
type crossprofileapps_service, app_api_service, system_server_service, service_manager_type;
type IProxyService_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type companion_device_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;