diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-01-21 09:57:01 -0800 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-01-28 11:41:53 -0800 |
| commit | 36d0eaecd7bd7970b91ac35d6753bf715097e3b9 (patch) | |
| tree | 5fc2626551d91d10f65796280403938541b9d894 /fs_mgr/include | |
| parent | 2f7ee6b7dd36f3d5c55473b67dc2430c795402ce (diff) | |
| download | system_core-36d0eaecd7bd7970b91ac35d6753bf715097e3b9.tar.gz system_core-36d0eaecd7bd7970b91ac35d6753bf715097e3b9.tar.bz2 system_core-36d0eaecd7bd7970b91ac35d6753bf715097e3b9.zip | |
Make encryption configurable
Delay mounting encryptable but unencrypted volumes until we can
check the ro.vold.forceencrypt flag, then optionally encrypt.
Requires matching vold change from
https://googleplex-android-review.git.corp.google.com/#/c/615309/
Bug: 18764230
Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
Diffstat (limited to 'fs_mgr/include')
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index 5e2ff416a..5ec3b991c 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -83,6 +83,7 @@ int fs_mgr_is_voldmanaged(struct fstab_rec *fstab); int fs_mgr_is_nonremovable(struct fstab_rec *fstab); int fs_mgr_is_verified(struct fstab_rec *fstab); int fs_mgr_is_encryptable(struct fstab_rec *fstab); +int fs_mgr_is_force_encrypted(struct fstab_rec *fstab); int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab); int fs_mgr_swapon_all(struct fstab *fstab); #ifdef __cplusplus |