diff options
| author | Leo Wang <leozwang@google.com> | 2015-01-09 01:17:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-09 01:17:51 +0000 |
| commit | f2bd3fdd190fc1234913febfe254f8bcc4e675da (patch) | |
| tree | f691707560a99b0967a1b333b8248386d418d56a | |
| parent | ba95be58c596aa7b5034b1bce8f3fde97ae08780 (diff) | |
| parent | 703b87de5b84e24ea119556dcc3683cb4ce941cf (diff) | |
| download | system_core-f2bd3fdd190fc1234913febfe254f8bcc4e675da.zip system_core-f2bd3fdd190fc1234913febfe254f8bcc4e675da.tar.gz system_core-f2bd3fdd190fc1234913febfe254f8bcc4e675da.tar.bz2 | |
Merge "Provide a way to select force encryption from vendor partition" into lmp-mr1-dev
| -rw-r--r-- | fs_mgr/fs_mgr.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index d1e92f2..ad02922 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -256,6 +256,15 @@ static int device_is_secure() { return strcmp(value, "0") ? 1 : 0; } +static int device_is_force_encrypted() { + int ret = -1; + char value[PROP_VALUE_MAX]; + ret = __system_property_get("ro.vold.forceencryption", value); + if (ret < 0) + return 0; + return strcmp(value, "1") ? 0 : 1; +} + /* * Tries to mount any of the consecutive fstab entries that match * the mountpoint of the one given by fstab->recs[start_idx]. @@ -378,7 +387,9 @@ int fs_mgr_mount_all(struct fstab *fstab) /* Deal with encryptability. */ if (!mret) { /* If this is encryptable, need to trigger encryption */ - if ((fstab->recs[attempted_idx].fs_mgr_flags & MF_FORCECRYPT)) { + if ( (fstab->recs[attempted_idx].fs_mgr_flags & MF_FORCECRYPT) + || (device_is_force_encrypted() + && fs_mgr_is_encryptable(&fstab->recs[attempted_idx]))) { if (umount(fstab->recs[attempted_idx].mount_point) == 0) { if (encryptable == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) { ERROR("Will try to encrypt %s %s\n", fstab->recs[attempted_idx].mount_point, |