Backport more public types to 202504
* drm_config_prop
* fwk_vold_service
* hal_attribute(hwcrypto);
Steps taken to re-finalize:
1. Temporarily reset BOARD_API_LEVEL of fina_0 to 202504
2. Revert 202504 APIs
* Remove system/sepolicy/prebuilts/api/202504
* Reset FREEZE_TEST_BOARD_API_LEVEL to 202504
3. Run the finalization script
4. Remove systsem/sepolicy/prebuilts/api/202504/private/compat/202504
Bug: 396240580
Test: TH
Test: build aosp_arm64-next-userdebug
Test: build aosp_arm64-trunk_staging-userdebug
Change-Id: I1c86544fadf938799038a31a652c015c320655d8
Merged-In: I1c86544fadf938799038a31a652c015c320655d8
diff --git a/private/attributes b/private/attributes
index 4f59acf..93bf295 100644
--- a/private/attributes
+++ b/private/attributes
@@ -40,3 +40,7 @@
until_board_api(202504, `
hal_attribute(vm_capabilities);
')
+
+until_board_api(202504, `
+ hal_attribute(hwcrypto);
+')
diff --git a/private/compat/202404/202404.ignore.cil b/private/compat/202404/202404.ignore.cil
index 8007d6c..224c49b 100644
--- a/private/compat/202404/202404.ignore.cil
+++ b/private/compat/202404/202404.ignore.cil
@@ -10,11 +10,13 @@
binderfs_logs_transactions
bluetooth_finder_prop
crosvm
+ drm_config_prop
early_virtmgr
early_virtmgr_exec
enable_16k_pages_prop
forensic_service
fstype_prop
+ fwk_vold_service
hal_mediaquality_service
hal_vm_capabilities_service
intrusion_detection_service
diff --git a/private/property.te b/private/property.te
index a2948eb..b39c7ed 100644
--- a/private/property.te
+++ b/private/property.te
@@ -117,7 +117,9 @@
system_vendor_config_prop(mmd_prop)
system_vendor_config_prop(mmd_shared_prop)
system_vendor_config_prop(prefetch_boot_prop)
-system_vendor_config_prop(widevine_sys_vendor_prop)
+until_board_api(202504, `
+ system_vendor_config_prop(drm_config_prop)
+')
typeattribute log_prop log_property_type;
typeattribute log_tag_prop log_property_type;
diff --git a/private/property_contexts b/private/property_contexts
index 8903291..8d9f61d 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -1815,10 +1815,10 @@
# Properties that allows vendors to enable Trusty widevine VM features
# Enable Widevine VM
-trusty.widevine_vm.enabled u:object_r:widevine_sys_vendor_prop:s0 exact bool
+trusty.widevine_vm.enabled u:object_r:drm_config_prop:s0 exact bool
# Sets the path used by Widevine HALs to find correct library for the widevine
# service provider location
-widevine.liboemcrypto.path u:object_r:widevine_sys_vendor_prop:s0 exact string
+widevine.liboemcrypto.path u:object_r:drm_config_prop:s0 exact string
# Properties for mmd
mmd. u:object_r:mmd_prop:s0
diff --git a/private/service.te b/private/service.te
index ab9351c..3b84e93 100644
--- a/private/service.te
+++ b/private/service.te
@@ -60,7 +60,9 @@
')
type uce_service, service_manager_type;
-type fwk_vold_service, service_manager_type;
+until_board_api(202504, `
+ type fwk_vold_service, service_manager_type;
+')
type wearable_sensing_service, app_api_service, system_server_service, service_manager_type;
type wifi_mainline_supplicant_service, service_manager_type;
type dynamic_instrumentation_service, app_api_service, system_server_service, service_manager_type;