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

Commit 504fd0a2 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg
Browse files

resolve merge conflicts of 083f4ecc to nyc-dev-plus-aosp 

Change-Id: I1532b1e4ee225f821fcd6a9eaee11f20bac8c9e1
parents def5b03a 083f4ecc

cmds/servicemanager/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ cc_binary { 
        "service_manager.c",

        "binder.c",

    ],

    shared_libs: ["libselinux"],

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

    init_rc: ["servicemanager.rc"],

}

cmds/servicemanager/service_manager.c

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include <stdlib.h>

#include <string.h>



#include <cutils/multiuser.h>



#include <private/android_filesystem_config.h>



#include <selinux/android.h>
@@ -122,7 +124,7 @@ static int svc_can_register(const uint16_t *name, size_t name_len, pid_t spid, u 
{

    const char *perm = "add";



    if (uid >= AID_APP) {

    if (multiuser_get_app_id(uid) >= AID_APP) {

        return 0; /* Don't allow apps to register services */

    }