tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d am: d150012349

Browse source 
am: 23b6547230

Change-Id: I3309e45435c80a2265685e456204faf73ed8fa36
This commit is contained in:
Jeff Sharkey 2017-01-19 16:35:07 +00:00 committed by android-build-merger
commit b1e89ec14f
4 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/cutils/multiuser.h
View file

@ -32,6 +32,7 @@ extern appid_t multiuser_get_app_id(uid_t uid);
extern uid_t multiuser_get_uid(userid_t user_id, appid_t app_id);
extern gid_t multiuser_get_cache_gid(userid_t user_id, appid_t app_id);
extern gid_t multiuser_get_ext_gid(userid_t user_id, appid_t app_id);
extern gid_t multiuser_get_shared_gid(userid_t user_id, appid_t app_id);
/* TODO: switch callers over to multiuser_get_shared_gid() */

4
include/private/android_filesystem_config.h
View file

@ -127,6 +127,7 @@
#define AID_MEDIA_VIDEO 1056 /* GID for video files on internal media storage */
#define AID_MEDIA_IMAGE 1057 /* GID for image files on internal media storage */
#define AID_TOMBSTONED 1058 /* tombstoned user */
#define AID_MEDIA_OBB 1059 /* GID for OBB files on internal media storage */
/* Changes to this file must be made in AOSP, *not* in internal branches. */
#define AID_SHELL 2000 /* adb and debug shell user */
@ -165,6 +166,9 @@
#define AID_CACHE_GID_START 20000 /* start of gids for apps to mark cached data */
#define AID_CACHE_GID_END 29999 /* end of gids for apps to mark cached data */
#define AID_EXT_GID_START 30000 /* start of gids for apps to mark external data */
#define AID_EXT_GID_END 39999 /* end of gids for apps to mark external data */
#define AID_SHARED_GID_START 50000 /* start of gids for apps in each user to share */
#define AID_SHARED_GID_END 59999 /* end of gids for apps in each user to share */

8
libcutils/multiuser.c
View file

@ -37,6 +37,14 @@ gid_t multiuser_get_cache_gid(userid_t user_id, appid_t app_id) {
}
}
gid_t multiuser_get_ext_gid(userid_t user_id, appid_t app_id) {
if (app_id >= AID_APP_START && app_id <= AID_APP_END) {
return multiuser_get_uid(user_id, (app_id - AID_APP_START) + AID_EXT_GID_START);
} else {
return -1;
}
}
gid_t multiuser_get_shared_gid(userid_t user_id, appid_t app_id) {
if (app_id >= AID_APP_START && app_id <= AID_APP_END) {
return multiuser_get_uid(user_id, (app_id - AID_APP_START) + AID_SHARED_GID_START);

8
libcutils/tests/multiuser_test.cpp
View file

@ -58,6 +58,14 @@ TEST(MultiuserTest, TestCache) {
EXPECT_EQ(1020000, multiuser_get_cache_gid(10, 10000));
}
TEST(MultiuserTest, TestExt) {
EXPECT_EQ(-1, multiuser_get_ext_gid(0, 0));
EXPECT_EQ(-1, multiuser_get_ext_gid(0, 1000));
EXPECT_EQ(30000, multiuser_get_ext_gid(0, 10000));
EXPECT_EQ(-1, multiuser_get_ext_gid(0, 50000));
EXPECT_EQ(1030000, multiuser_get_ext_gid(10, 10000));
}
TEST(MultiuserTest, TestShared) {
EXPECT_EQ(-1, multiuser_get_shared_gid(0, 0));
EXPECT_EQ(-1, multiuser_get_shared_gid(0, 1000));