diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-16 14:32:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-16 14:33:00 -0700 |
| commit | 2be5338a84f19b24b6515c0bfcf2f3f7b55262c1 (patch) | |
| tree | bbe06c96de4f88b1cc484bc33f2e967403fab014 /include | |
| parent | edb2d634b35ec1b0268ac7d9ddab8c8fc082a14e (diff) | |
| parent | 885342a0f2c834a6b680284047c47c9d04b32565 (diff) | |
| download | system_core-2be5338a84f19b24b6515c0bfcf2f3f7b55262c1.zip system_core-2be5338a84f19b24b6515c0bfcf2f3f7b55262c1.tar.gz system_core-2be5338a84f19b24b6515c0bfcf2f3f7b55262c1.tar.bz2 | |
Merge "Multi-user external storage support." into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/multiuser.h | 6 | ||||
| -rw-r--r-- | include/private/android_filesystem_config.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/cutils/multiuser.h b/include/cutils/multiuser.h index 22bb032..0bf403c 100644 --- a/include/cutils/multiuser.h +++ b/include/cutils/multiuser.h @@ -30,9 +30,9 @@ extern "C" { typedef uid_t userid_t; typedef uid_t appid_t; -extern userid_t getUserId(uid_t uid); -extern appid_t getAppId(uid_t uid); -extern uid_t getUid(userid_t userId, appid_t appId); +extern userid_t multiuser_getUserId(uid_t uid); +extern appid_t multiuser_getAppId(uid_t uid); +extern uid_t multiuser_getUid(userid_t userId, appid_t appId); #ifdef __cplusplus } diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 6521cbe..012c2ae 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -229,6 +229,9 @@ static struct fs_path_config android_files[] = { { 00644, AID_ROOT, AID_ROOT, 0 }, }; +#define EXTERNAL_STORAGE_SYSTEM "/mnt/secure/sdcard0" +#define EXTERNAL_STORAGE_APP "/storage/sdcard0" + static inline void fs_config(const char *path, int dir, unsigned *uid, unsigned *gid, unsigned *mode) { |