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

Commit d933fc0c authored by Paul Lawrence's avatar Paul Lawrence Committed by Android Git Automerger
Browse files

am a1738915: am 317b4024: Revert "Make encryption configurable" 

* commit 'a1738915':
  Revert "Make encryption configurable"
parents 14b964f5 a1738915

fs_mgr/fs_mgr.c

+3 −1
Original line number Diff line number Diff line
@@ -488,7 +488,9 @@ int fs_mgr_mount_all(struct fstab *fstab) 
        /* Deal with encryptability. */

        if (!mret) {

            /* If this is encryptable, need to trigger encryption */

          if (fs_mgr_is_encryptable(&fstab->recs[attempted_idx])) {

            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,

fs_mgr/fs_mgr_fstab.c

+0 −5
Original line number Diff line number Diff line
@@ -428,11 +428,6 @@ int fs_mgr_is_encryptable(struct fstab_rec *fstab) 
    return fstab->fs_mgr_flags & (MF_CRYPT | MF_FORCECRYPT);

}



int fs_mgr_is_force_encrypted(struct fstab_rec *fstab)

{

    return fstab->fs_mgr_flags & MF_FORCECRYPT;

}



int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab)

{

    return fstab->fs_mgr_flags & MF_NOEMULATEDSD;

fs_mgr/include/fs_mgr.h

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

rootdir/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted 
    # encryption) or trigger_restart_min_framework (other encryption)



# One shot invocation to encrypt unencrypted volumes

service encrypt /system/bin/vdc --wait cryptfs maybeenabledefaultcrypto

service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default

    disabled

    oneshot

    # vold will set vold.decrypt to trigger_restart_framework (default