ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev

Browse source 
* commit '777a00e3d193e45d928b1a26de85ae5a238271c4':
  New fstab flags to support more expressive SD card permissions
This commit is contained in:
Ken Sumrall 2013-09-23 18:59:39 -07:00 • committed by Android Git Automerger
commit 12d7192586
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/fs_mgr.c
View file

@ -92,6 +92,7 @@ static struct flag_list fs_mgr_flags[] = {
{ "swapprio=", MF_SWAPPRIO }, { "swapprio=", MF_SWAPPRIO },
{ "zramsize=", MF_ZRAMSIZE }, { "zramsize=", MF_ZRAMSIZE },
{ "verify", MF_VERIFY }, { "verify", MF_VERIFY },
{ "noemulatedsd", MF_NOEMULATEDSD },
{ "defaults", 0 }, { "defaults", 0 },
{ 0, 0 }, { 0, 0 },
}; };
@ -877,3 +878,8 @@ int fs_mgr_is_encryptable(struct fstab_rec *fstab)
{ {
return fstab->fs_mgr_flags & MF_CRYPT; return fstab->fs_mgr_flags & MF_CRYPT;
} }
int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab)
{
return fstab->fs_mgr_flags & MF_NOEMULATEDSD;
}

6
fs_mgr/fs_mgr_priv.h
View file

@ -72,6 +72,12 @@
#define MF_SWAPPRIO 0x80 #define MF_SWAPPRIO 0x80
#define MF_ZRAMSIZE 0x100 #define MF_ZRAMSIZE 0x100
#define MF_VERIFY 0x200 #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 #define DM_BUF_SIZE 4096

1
fs_mgr/include/fs_mgr.h
View file

@ -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_voldmanaged(struct fstab_rec *fstab);
int fs_mgr_is_nonremovable(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_encryptable(struct fstab_rec *fstab);
int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab);
int fs_mgr_swapon_all(struct fstab *fstab); int fs_mgr_swapon_all(struct fstab *fstab);
#ifdef __cplusplus #ifdef __cplusplus
} }