commit 504fd0a2e933628c223ec3e3db5a4ddce7ef71ea
author Arve Hjønnevåg <arve@android.com> Thu Aug 18 18:23:22 2016 -0700
committer Arve Hjønnevåg <arve@android.com> Thu Aug 18 18:23:22 2016 -0700
tree 786cf16d8659c801ac1faee183e2b01ab8b441ca
parent def5b03a2e64628dca657789050a340b33a1796e
parent 083f4ecca201e508f0f5cbe0aa95882a82abdf5e

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

Change-Id: I1532b1e4ee225f821fcd6a9eaee11f20bac8c9e1

cmds/servicemanager/Android.bp

diff --git a/cmds/servicemanager/Android.bp b/cmds/servicemanager/Android.bp
index bc150cb..dc8e675 100644
--- a/cmds/servicemanager/Android.bp
+++ b/cmds/servicemanager/Android.bp
@@ -31,6 +31,6 @@
         "service_manager.c",
         "binder.c",
     ],
-    shared_libs: ["libselinux"],
+    shared_libs: ["libcutils", "libselinux"],
     init_rc: ["servicemanager.rc"],
 }

cmds/servicemanager/service_manager.c

diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 8a8e688..68e3ceb 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>
@@ -122,7 +124,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 */
     }