diff options
| author | Ken Sumrall <ksumrall@android.com> | 2013-09-11 19:42:51 -0700 |
|---|---|---|
| committer | Ken Sumrall <ksumrall@android.com> | 2013-09-20 17:43:52 -0700 |
| commit | 887f2892062c64fa688fc9525ebd09cc98ca70d8 (patch) | |
| tree | c028683f69e5304aa704a03d7034bcbbbaddd2ab | |
| parent | 7b445a8e3a21055a5735585ca0890d14977032f0 (diff) | |
| download | core-887f2892062c64fa688fc9525ebd09cc98ca70d8.tar.gz | |
New fstab flags to support more expressive SD card permissions
Bug: 10330128
Change-Id: I41fb178b839487b604762fbc1ccba097d25c7aa0
| -rw-r--r-- | fs_mgr/fs_mgr.c | 6 | ||||
| -rw-r--r-- | fs_mgr/fs_mgr_priv.h | 6 | ||||
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 82c579821..ea60cc899 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -92,6 +92,7 @@ static struct flag_list fs_mgr_flags[] = { { "swapprio=", MF_SWAPPRIO }, { "zramsize=", MF_ZRAMSIZE }, { "verify", MF_VERIFY }, + { "noemulatedsd", MF_NOEMULATEDSD }, { "defaults", 0 }, { 0, 0 }, }; @@ -931,3 +932,8 @@ int fs_mgr_is_encryptable(struct fstab_rec *fstab) { return fstab->fs_mgr_flags & MF_CRYPT; } + +int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab) +{ + return fstab->fs_mgr_flags & MF_NOEMULATEDSD; +} diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index f284ca69e..59ffd785c 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -72,6 +72,12 @@ #define MF_SWAPPRIO 0x80 #define MF_ZRAMSIZE 0x100 #define MF_VERIFY 0x200 +/* + * There is no emulated sdcard daemon running on /data/media on this device, + * so treat the physical SD card as the only external storage device, + * a la the Nexus One. + */ +#define MF_NOEMULATEDSD 0x400 #define DM_BUF_SIZE 4096 diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index 384d19594..0f90c32f1 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -62,6 +62,7 @@ struct fstab_rec *fs_mgr_get_entry_for_mount_point(struct fstab *fstab, const ch int fs_mgr_is_voldmanaged(struct fstab_rec *fstab); int fs_mgr_is_nonremovable(struct fstab_rec *fstab); int fs_mgr_is_encryptable(struct fstab_rec *fstab); +int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab); int fs_mgr_swapon_all(struct fstab *fstab); #ifdef __cplusplus } |