From 2d9d3e6de3d1996510758590554a5fa5b00e9c14 Mon Sep 17 00:00:00 2001
From: Prashant Malani <pmalani@google.com>
Date: Wed, 19 Oct 2016 09:54:20 -0700
Subject: [PATCH] Cleanup and renaming of vibrator HAL sepolicy
Renaming vibrator sepolicy to remove the version number.
Also moving the related binder_call() to maintain alphabetical order.
Bug: 32123421
Change-Id: I2bfa835085519ed10f61ddf74e7e668dd12bda04
Test: booted, and checked vibrate on keypress on bullhead
---
private/android_hardware_vibrator_1_0_service.te | 2 --
private/android_hardware_vibrator_service.te | 2 ++
private/file_contexts | 2 +-
public/android_hardware_vibrator_1_0_service.te | 9 ---------
public/android_hardware_vibrator_service.te | 9 +++++++++
public/system_server.te | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 private/android_hardware_vibrator_1_0_service.te
create mode 100644 private/android_hardware_vibrator_service.te
delete mode 100644 public/android_hardware_vibrator_1_0_service.te
create mode 100644 public/android_hardware_vibrator_service.te
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 1c99d233a..000000000
--- 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 000000000..ca8cc2498
--- /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 a4a8770c4..5290c2c8d 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 17336a51c..000000000
--- 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 000000000..37381e8f7
--- /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 9805a1ad8..f61bcabaa 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.
#
--
GitLab