commit 06b01aba73341ef4ddc64b4293d03e7c5e12063b
author Steven Moreland <smoreland@google.com> Wed Sep 12 16:27:55 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 12 16:27:55 2018 -0700
tree f9b4c91e883ccbc13fb64e4ea15324d45cd21674
parent 5590cb6bfbfb5f5a5f772517b03410df2564fc99
parent 8fc56b7bc8b8f1cd5f7c9f07c0ad40aeaa45b3a2

Merge "vndservicemanager: use selinux_vendor_log_callback" am: 5cacd7ca04 am: cef297f7c0
am: 8fc56b7bc8

Change-Id: I7a70cf7352842810e9ee1edcddc851fef9c3cc66

cmds/servicemanager/service_manager.c

diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 6b340a8..d776682 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -403,7 +403,11 @@
 
     cb.func_audit = audit_callback;
     selinux_set_callback(SELINUX_CB_AUDIT, cb);
+#ifdef VENDORSERVICEMANAGER
+    cb.func_log = selinux_vendor_log_callback;
+#else
     cb.func_log = selinux_log_callback;
+#endif
     selinux_set_callback(SELINUX_CB_LOG, cb);
 
 #ifdef VENDORSERVICEMANAGER