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

Commit 2cb14836 authored by Arve Hjnnevg's avatar Arve Hjnnevg Committed by android-build-merger
Browse files

ServiceManager: Allow system services running as secondary users to add services 

am: e6bbe69b

Change-Id: Iebb7be5ff42026adb2ff2d2b610902b995acdbc0
parents a82f8229 e6bbe69b

cmds/servicemanager/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_MODULE_TAGS := optional 
include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)

LOCAL_SHARED_LIBRARIES := liblog libselinux

LOCAL_SHARED_LIBRARIES := liblog libcutils libselinux

LOCAL_SRC_FILES := service_manager.c binder.c

LOCAL_CFLAGS += $(svc_c_flags)

LOCAL_MODULE := servicemanager

cmds/servicemanager/service_manager.c

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

#include <fcntl.h>



#include <cutils/multiuser.h>



#include <private/android_filesystem_config.h>



#include <selinux/android.h>
@@ -111,7 +113,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 */

    }