diff --git a/private/android_hardware_vibrator_1_0_service.te b/private/android_hardware_vibrator_1_0_service.te
deleted file mode 100644
index 1c99d233a714966148835f88d85f23dfc0f69f9a..0000000000000000000000000000000000000000
--- a/private/android_hardware_vibrator_1_0_service.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# may be started by init
-init_daemon_domain(android_hardware_vibrator_1_0_service)
diff --git a/private/android_hardware_vibrator_service.te b/private/android_hardware_vibrator_service.te
new file mode 100644
index 0000000000000000000000000000000000000000..ca8cc2498955bb008fefc602072098f9bbc93466
--- /dev/null
+++ b/private/android_hardware_vibrator_service.te
@@ -0,0 +1,2 @@
+# may be started by init
+init_daemon_domain(android_hardware_vibrator_service)
diff --git a/private/file_contexts b/private/file_contexts
index a4a8770c403b679f31390faaa94b0403ab096188..5290c2c8df5ad86ef1d563e198072f57e91dc038 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -222,7 +222,7 @@
/system/fake-lib(64)?/libart.* u:object_r:libart_file:s0
/system/lib(64)?/libart.* u:object_r:libart_file:s0
/system/bin/hw/android.hardware.nfc@1.0-service u:object_r:android_hardware_nfc_1_0_service_exec:s0
-/system/bin/hw/android.hardware.vibrator@1.0-service u:object_r:android_hardware_vibrator_1_0_service_exec:s0
+/system/bin/hw/android.hardware.vibrator@1.0-service u:object_r:android_hardware_vibrator_service_exec:s0
#############################
# Vendor files
diff --git a/public/android_hardware_vibrator_1_0_service.te b/public/android_hardware_vibrator_1_0_service.te
deleted file mode 100644
index 17336a51c731c2a9c9210cbf359defa2ac4ec00e..0000000000000000000000000000000000000000
--- a/public/android_hardware_vibrator_1_0_service.te
+++ /dev/null
@@ -1,9 +0,0 @@
-# vibrator subsystem
-type android_hardware_vibrator_1_0_service, domain;
-type android_hardware_vibrator_1_0_service_exec, exec_type, file_type;
-
-# hwbinder access
-hwbinder_use(android_hardware_vibrator_1_0_service)
-
-# vibrator sysfs rw access
-allow android_hardware_vibrator_1_0_service sysfs_vibrator:file rw_file_perms;
diff --git a/public/android_hardware_vibrator_service.te b/public/android_hardware_vibrator_service.te
new file mode 100644
index 0000000000000000000000000000000000000000..37381e8f72fdddb4f06e04a817a4925738c62c64
--- /dev/null
+++ b/public/android_hardware_vibrator_service.te
@@ -0,0 +1,9 @@
+# vibrator subsystem
+type android_hardware_vibrator_service, domain;
+type android_hardware_vibrator_service_exec, exec_type, file_type;
+
+# hwbinder access
+hwbinder_use(android_hardware_vibrator_service)
+
+# vibrator sysfs rw access
+allow android_hardware_vibrator_service sysfs_vibrator:file rw_file_perms;
diff --git a/public/system_server.te b/public/system_server.te
index 9805a1ad863966b7f7d468806da1b5229824f7cd..f61bcabaaf85830c5cee80eb47b1f0173ad9b22c 100644
--- a/public/system_server.te
+++ b/public/system_server.te
@@ -147,6 +147,7 @@ allow system_server surfaceflinger:unix_stream_socket { read write setopt };
# Perform Binder IPC.
binder_use(system_server)
+binder_call(system_server, android_hardware_vibrator_service)
binder_call(system_server, binderservicedomain)
binder_call(system_server, gatekeeperd)
binder_call(system_server, fingerprintd)
@@ -155,7 +156,6 @@ binder_call(system_server, dumpstate)
binder_call(system_server, netd)
binder_call(system_server, wificond)
binder_service(system_server)
-binder_call(system_server, android_hardware_vibrator_1_0_service)
# Ask debuggerd to dump backtraces for native stacks of interest.
#