Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 777a00e3 authored by Ken Sumrall's avatar Ken Sumrall Committed by Android (Google) Code Review
Browse files

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

parents 0ee7d8c6 887f2892

fs_mgr/fs_mgr.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

}

fs_mgr/fs_mgr_priv.h

+6 −0
Original line number Diff line number Diff line
@@ -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

fs_mgr/include/fs_mgr.h

+1 −0
Original line number Diff line number Diff line
@@ -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

}