diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index 9d3127a0e0e17dbda7570d9da44b63838dc7cdfc..9242070c356452cc8e71aca0937e9008074e0168 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -62,7 +62,7 @@
hal_codec2_hwservice
hal_confirmationui_hwservice
hal_evs_hwservice
- hal_health_filesystem_hwservice
+ hal_health_storage_hwservice
hal_lowpan_hwservice
hal_neuralnetworks_hwservice
hal_secure_element_hwservice
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 1d1e9322f48cff6503a4890da49cdebfc4aa9e35..6b5a71da4a8687310b162b7f674005ee48e71d99 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -56,7 +56,7 @@
hal_codec2_hwservice
hal_confirmationui_hwservice
hal_evs_hwservice
- hal_health_filesystem_hwservice
+ hal_health_storage_hwservice
hal_lowpan_hwservice
hal_secure_element_hwservice
hal_system_suspend_default
diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index 7f1acad05322f7fe7940afe663a27c3b6efe15ab..87078a65a1f91edc50226de3f3a66185a72faec4 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -9,7 +9,7 @@
biometric_prompt_service
fastbootd
color_display_service
- hal_health_filesystem_hwservice
+ hal_health_storage_hwservice
hal_system_suspend_default
hal_system_suspend_default_exec
hal_system_suspend_default_tmpfs
diff --git a/private/hwservice_contexts b/private/hwservice_contexts
index 508d9256b7bbcdc919bbd60238177d2de8e0eb5c..9af432dd5229a5da28a9a518a4c0dd2982ea27e6 100644
--- a/private/hwservice_contexts
+++ b/private/hwservice_contexts
@@ -27,7 +27,7 @@ android.hardware.graphics.allocator::IAllocator u:object_r:hal_g
android.hardware.graphics.composer::IComposer u:object_r:hal_graphics_composer_hwservice:s0
android.hardware.graphics.mapper::IMapper u:object_r:hal_graphics_mapper_hwservice:s0
android.hardware.health::IHealth u:object_r:hal_health_hwservice:s0
-android.hardware.health.filesystem::IFileSystem u:object_r:hal_health_filesystem_hwservice:s0
+android.hardware.health.storage::IStorage u:object_r:hal_health_storage_hwservice:s0
android.hardware.ir::IConsumerIr u:object_r:hal_ir_hwservice:s0
android.hardware.keymaster::IKeymasterDevice u:object_r:hal_keymaster_hwservice:s0
android.hardware.light::ILight u:object_r:hal_light_hwservice:s0
diff --git a/public/attributes b/public/attributes
index ec707cc7999fe9a1e6dded17ea9ea3dfd73d7374..ecfe3739129ad9b6f76738ce67fc8f9526e223f2 100644
--- a/public/attributes
+++ b/public/attributes
@@ -258,7 +258,7 @@ hal_attribute(gnss);
hal_attribute(graphics_allocator);
hal_attribute(graphics_composer);
hal_attribute(health);
-hal_attribute(health_filesystem);
+hal_attribute(health_storage);
hal_attribute(ir);
hal_attribute(keymaster);
hal_attribute(light);
diff --git a/public/hal_health_filesystem.te b/public/hal_health_filesystem.te
deleted file mode 100644
index 4d02adc7ae15ca5ff1a281980db2bb4d0e2c94b8..0000000000000000000000000000000000000000
--- a/public/hal_health_filesystem.te
+++ /dev/null
@@ -1,5 +0,0 @@
-# HwBinder IPC from client to server, and callbacks
-binder_call(hal_health_filesystem_client, hal_health_filesystem_server)
-binder_call(hal_health_filesystem_server, hal_health_filesystem_client)
-
-hal_attribute_hwservice(hal_health_filesystem, hal_health_filesystem_hwservice)
diff --git a/public/hal_health_storage.te b/public/hal_health_storage.te
new file mode 100644
index 0000000000000000000000000000000000000000..61e609b68d9b0794e80b4bc90ac1895db38b82b4
--- /dev/null
+++ b/public/hal_health_storage.te
@@ -0,0 +1,5 @@
+# HwBinder IPC from client to server, and callbacks
+binder_call(hal_health_storage_client, hal_health_storage_server)
+binder_call(hal_health_storage_server, hal_health_storage_client)
+
+hal_attribute_hwservice(hal_health_storage, hal_health_storage_hwservice)
diff --git a/public/hwservice.te b/public/hwservice.te
index 2153547339a1cd539f86ced83b0b5945ea702e30..3e3a6c8a209574afa833d8f97e88bb36ab18a6d5 100644
--- a/public/hwservice.te
+++ b/public/hwservice.te
@@ -24,7 +24,7 @@ type hal_graphics_allocator_hwservice, hwservice_manager_type;
type hal_graphics_composer_hwservice, hwservice_manager_type;
type hal_graphics_mapper_hwservice, hwservice_manager_type, same_process_hwservice;
type hal_health_hwservice, hwservice_manager_type;
-type hal_health_filesystem_hwservice, hwservice_manager_type;
+type hal_health_storage_hwservice, hwservice_manager_type;
type hal_ir_hwservice, hwservice_manager_type;
type hal_keymaster_hwservice, hwservice_manager_type;
type hal_light_hwservice, hwservice_manager_type;
diff --git a/public/vold.te b/public/vold.te
index 604c104e88dd76cc98853be22e41482967388785..2097392046f3ef9393d590ec98525fb05df23627 100644
--- a/public/vold.te
+++ b/public/vold.te
@@ -166,8 +166,8 @@ binder_call(vold, healthd)
# talk to keymaster
hal_client_domain(vold, hal_keymaster)
-# talk to health filesystem HAL
-hal_client_domain(vold, hal_health_filesystem)
+# talk to health storage HAL
+hal_client_domain(vold, hal_health_storage)
# Access userdata block device.
allow vold userdata_block_device:blk_file rw_file_perms;
@@ -268,7 +268,7 @@ neverallow { domain -vold -init } restorecon_prop:property_service set;
neverallow { domain -system_server -vdc -vold } vold_service:service_manager find;
neverallow vold {
domain
- -hal_health_filesystem_server
+ -hal_health_storage_server
-hal_keymaster_server
-hal_system_suspend_server
-healthd
diff --git a/vendor/file_contexts b/vendor/file_contexts
index 9728b7ca0166c68f0635c9a627b4aff704fbd9ef..c4e6648be77bd83b89af0eb83aeec1052056ff8b 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -26,7 +26,7 @@
/(vendor|system/vendor)/bin/hw/android\.hardware\.graphics\.composer@2\.2-service u:object_r:hal_graphics_composer_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.health@1\.0-service u:object_r:hal_health_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.health@2\.0-service u:object_r:hal_health_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.health\.filesystem@1\.0-service u:object_r:hal_health_filesystem_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.health\.storage@1\.0-service u:object_r:hal_health_storage_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.ir@1\.0-service u:object_r:hal_ir_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@3\.0-service u:object_r:hal_keymaster_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@4\.0-service u:object_r:hal_keymaster_default_exec:s0
diff --git a/vendor/hal_health_filesystem_default.te b/vendor/hal_health_filesystem_default.te
deleted file mode 100644
index b680a255f2c408e0b99636cf2bae2c81b1506151..0000000000000000000000000000000000000000
--- a/vendor/hal_health_filesystem_default.te
+++ /dev/null
@@ -1,6 +0,0 @@
-type hal_health_filesystem_default, domain;
-hal_server_domain(hal_health_filesystem_default, hal_health_filesystem)
-
-type hal_health_filesystem_default_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_health_filesystem_default)
-
diff --git a/vendor/hal_health_storage_default.te b/vendor/hal_health_storage_default.te
new file mode 100644
index 0000000000000000000000000000000000000000..37b3e246bfb86053b6f008ca0f12b9eb7da08cb7
--- /dev/null
+++ b/vendor/hal_health_storage_default.te
@@ -0,0 +1,6 @@
+type hal_health_storage_default, domain;
+hal_server_domain(hal_health_storage_default, hal_health_storage)
+
+type hal_health_storage_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(hal_health_storage_default)
+