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

Commit 31361232 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

vndservicemanager: load vendor service_contexts. 

Also, don't crash when /dev/vndbinder is not
accessible.

Bug: 36052864
Test: loads vendor service contexts
Test: doesn't crash without /dev/vndbinder, works with it
Change-Id: Ida9dd94791206e14246348a8b8e66be09ed8fca7
parent 34ca5f2a

cmds/servicemanager/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ cc_binary { 
        "service_manager.c",

        "binder.c",

    ],

    cflags: [

        "-DVENDORSERVICEMANAGER=1",

    ],

    shared_libs: ["libcutils", "libselinux"],

    init_rc: ["vndservicemanager.rc"],

}

cmds/servicemanager/service_manager.c

+14 −4
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ 


#include "binder.h"



#if 0

#define ALOGI(x...) fprintf(stderr, "svcmgr: " x)

#define ALOGE(x...) fprintf(stderr, "svcmgr: " x)

#ifdef VENDORSERVICEMANAGER

#define LOG_TAG "VendorServiceManager"

#else

#define LOG_TAG "ServiceManager"

#include <log/log.h>

#endif

#include <log/log.h>



struct audit_data {

    pid_t pid;
@@ -374,7 +373,14 @@ int main(int argc, char** argv) 


    bs = binder_open(driver, 128*1024);

    if (!bs) {

#ifdef VENDORSERVICEMANAGER

        ALOGW("failed to open binder driver %s\n", driver);

        while (true) {

            sleep(UINT_MAX);

        }

#else

        ALOGE("failed to open binder driver %s\n", driver);

#endif

        return -1;

    }
@@ -388,7 +394,11 @@ int main(int argc, char** argv) 
    cb.func_log = selinux_log_callback;

    selinux_set_callback(SELINUX_CB_LOG, cb);



#ifdef VENDORSERVICEMANAGER

    sehandle = selinux_android_vendor_service_context_handle();

#else

    sehandle = selinux_android_service_context_handle();

#endif

    selinux_status_open(true);



    if (sehandle == NULL) {