summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2022-06-08 22:33:37 +0000
committer Steven Moreland <smoreland@google.com> 2022-10-14 23:19:57 +0000
commitb1522619ac38c91b8bb95b8a804d4b9c67d7896f (patch)
tree4e38f9c941c507522ce1e38fb9fccb8aaed43cfa
parentcb23441ce5323bc30c7729d2cc478a99ecfe274c (diff)
servicemanager: always use kernel log
previously only used in recovery Bug: 235390578 Bug: 210919187 Test: boot (logs still only show up when restarting servicemanager) Change-Id: I89426c7fe27a4c24783e13e3d5d47764e30a3a5b
-rw-r--r--cmds/servicemanager/main.cpp2
-rw-r--r--cmds/servicemanager/servicemanager.rc1
-rw-r--r--cmds/servicemanager/vndservicemanager.rc1
3 files changed, 2 insertions, 2 deletions
diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp
index a831d1b74d..c1a04dde89 100644
--- a/cmds/servicemanager/main.cpp
+++ b/cmds/servicemanager/main.cpp
@@ -111,9 +111,7 @@ private:
};
int main(int argc, char** argv) {
-#ifdef __ANDROID_RECOVERY__
android::base::InitLogging(argv, android::base::KernelLogger);
-#endif
if (argc > 2) {
LOG(FATAL) << "usage: " << argv[0] << " [binder driver]";
diff --git a/cmds/servicemanager/servicemanager.rc b/cmds/servicemanager/servicemanager.rc
index 6b35265fc8..3bd6db5ef6 100644
--- a/cmds/servicemanager/servicemanager.rc
+++ b/cmds/servicemanager/servicemanager.rc
@@ -3,6 +3,7 @@ service servicemanager /system/bin/servicemanager
user system
group system readproc
critical
+ file /dev/kmsg w
onrestart setprop servicemanager.ready false
onrestart restart apexd
onrestart restart audioserver
diff --git a/cmds/servicemanager/vndservicemanager.rc b/cmds/servicemanager/vndservicemanager.rc
index c9305a1c60..80af1d1377 100644
--- a/cmds/servicemanager/vndservicemanager.rc
+++ b/cmds/servicemanager/vndservicemanager.rc
@@ -2,6 +2,7 @@ service vndservicemanager /vendor/bin/vndservicemanager /dev/vndbinder
class core
user system
group system readproc
+ file /dev/kmsg w
task_profiles ServiceCapacityLow
onrestart class_restart main
onrestart class_restart hal