Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb0385f1 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: always use kernel log" am: 62f59c3d am: adf3caac 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2120126



Change-Id: I25787d154a94c1e8bab913b493656c1879321954
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb28d109 adf3caac

cmds/servicemanager/main.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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]";

cmds/servicemanager/servicemanager.rc

+1 −0
Original line number Diff line number Diff line
@@ -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

cmds/servicemanager/vndservicemanager.rc

+1 −0
Original line number Diff line number Diff line
@@ -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