commit 1f36bcd2bab3d20ab05c0993d41dd29cefda26ab
author Arve Hjnnevg <arve@android.com> Fri Aug 19 01:07:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 19 01:07:30 2016 +0000
tree 9ef8e700e749772f8c9005ff2457b586a1a4ca49
parent b8d937caeb047534ab885deed746055307d591cc
parent fa5aafc9f3f32175e1442fe2940a02805eb76c8a

ServiceManager: Allow system services running as secondary users to add services am: e6bbe69ba7 am: 2cb14836ac am: c29c3734af am: ce0e72911c am: 2c39ea1025
am: fa5aafc9f3

Change-Id: I2b83c66f04f7dbfb1740d525ba6d424c9ea42c2b

cmds/servicemanager/Android.mk

diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk
index 155cfc5..5bafd53 100644
--- a/cmds/servicemanager/Android.mk
+++ b/cmds/servicemanager/Android.mk
@@ -18,7 +18,7 @@
 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

diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 4c993c2..031f8489 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -8,6 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <cutils/multiuser.h>
+
 #include <private/android_filesystem_config.h>
 
 #include <selinux/android.h>
@@ -111,7 +113,7 @@
 {
     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 */
     }