commit c29c3734afa4898dd67a6ff9d368cbfb91238c03
author Arve Hjnnevg <arve@android.com> Fri Aug 19 00:49:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 19 00:49:29 2016 +0000
tree cbfeea99f09ae2824b6aa44e4b4363db4a3cd778
parent 1c220583e4e7905ffabed4e62d3945a9d82b89a6
parent 2cb14836ac536fe85bd2293a69a92de3d3768a62

ServiceManager: Allow system services running as secondary users to add services am: e6bbe69ba7
am: 2cb14836ac

Change-Id: Ia7deecedc7eff4fb35742ba9c7475ca32ecf48aa

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 7c343af..e20c13f 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -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 @@
 {
     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 */
     }