Multi-user external storage support.
Remount rootfs as recursively shared, so that mount changes are
propagated into child namespaces. Mount external storage for access
from adb.
Clean multi-user dependencies for use in Dalvik. Also define
external storage paths.
Bug: 6925012
Change-Id: I375de581a63f4f36667894c56a34a9dd45361e8f
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 2477d23..6d525ba 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -50,7 +50,8 @@
threads.c \
sched_policy.c \
iosched_policy.c \
- str_parms.c
+ str_parms.c \
+ multiuser.c
commonHostSources := \
ashmem-host.c
@@ -124,8 +125,7 @@
mq.c \
partition_utils.c \
qtaguid.c \
- uevent.c \
- multiuser.c
+ uevent.c
ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES += arch-arm/memset32.S
diff --git a/libcutils/multiuser.c b/libcutils/multiuser.c
index be9304d..3c86cee 100644
--- a/libcutils/multiuser.c
+++ b/libcutils/multiuser.c
@@ -14,19 +14,16 @@
* limitations under the License.
*/
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
#include <cutils/multiuser.h>
-userid_t getUserId(uid_t uid) {
+userid_t multiuser_getUserId(uid_t uid) {
return uid / MULTIUSER_APP_PER_USER_RANGE;
}
-appid_t getAppId(uid_t uid) {
+appid_t multiuser_getAppId(uid_t uid) {
return uid % MULTIUSER_APP_PER_USER_RANGE;
}
-uid_t getUid(userid_t userId, appid_t appId) {
+uid_t multiuser_getUid(userid_t userId, appid_t appId) {
return userId * MULTIUSER_APP_PER_USER_RANGE + (appId % MULTIUSER_APP_PER_USER_RANGE);
}