| commit | bb0385f13f50fb5645c520ca5021a31a13204218 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Oct 18 20:56:23 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 18 20:56:23 2022 +0000 |
| tree | 44d2deebb0f6c7e63027af27e4e86ec95b575e2f | |
| parent | bb28d1097bea44416360a780691c9937b5357f4b [diff] | |
| parent | adf3caac1de53a8014a070069ad8ab39f87c31ab [diff] |
Merge "servicemanager: always use kernel log" am: 62f59c3dc6 am: adf3caac1d Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2120126 Change-Id: I25787d154a94c1e8bab913b493656c1879321954 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp index a831d1b..c1a04dd 100644 --- a/cmds/servicemanager/main.cpp +++ b/cmds/servicemanager/main.cpp
@@ -111,9 +111,7 @@ }; 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 6b35265..3bd6db5 100644 --- a/cmds/servicemanager/servicemanager.rc +++ b/cmds/servicemanager/servicemanager.rc
@@ -3,6 +3,7 @@ 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 c9305a1..80af1d1 100644 --- a/cmds/servicemanager/vndservicemanager.rc +++ b/cmds/servicemanager/vndservicemanager.rc
@@ -2,6 +2,7 @@ class core user system group system readproc + file /dev/kmsg w task_profiles ServiceCapacityLow onrestart class_restart main onrestart class_restart hal