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

Commit 0cc8da09 authored by Bill Yi's avatar Bill Yi
Browse files

Merge commit '9c1bc6bb' into HEAD

parents 18daa159 9c1bc6bb

fs_mgr/fs_mgr.c

+5 −2
Original line number Diff line number Diff line
@@ -154,9 +154,10 @@ static void check_fs(char *blk_device, char *fs_type, char *target) 
    } else if (!strcmp(fs_type, "f2fs")) {

            char *f2fs_fsck_argv[] = {

                    F2FS_FSCK_BIN,

                    "-f",

                    blk_device

            };

        INFO("Running %s on %s\n", F2FS_FSCK_BIN, blk_device);

        INFO("Running %s -f %s\n", F2FS_FSCK_BIN, blk_device);



        ret = android_fork_execvp_ext(ARRAY_SIZE(f2fs_fsck_argv), f2fs_fsck_argv,

                                      &status, true, LOG_KLOG | LOG_FILE,
@@ -487,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/fs_mgr_verity.c

+3 −3
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ static RSAPublicKey *load_key(char *path) 
static int verify_table(char *signature, char *table, int table_length)

{

    RSAPublicKey *key;

    uint8_t hash_buf[SHA_DIGEST_SIZE];

    uint8_t hash_buf[SHA256_DIGEST_SIZE];

    int retval = -1;



    // Hash the table

    SHA_hash((uint8_t*)table, table_length, hash_buf);

    SHA256_hash((uint8_t*)table, table_length, hash_buf);



    // Now get the public key from the keyfile

    key = load_key(VERITY_TABLE_RSA_KEY);
@@ -104,7 +104,7 @@ static int verify_table(char *signature, char *table, int table_length) 
                    (uint8_t*) signature,

                    RSANUMBYTES,

                    (uint8_t*) hash_buf,

                    SHA_DIGEST_SIZE)) {

                    SHA256_DIGEST_SIZE)) {

        ERROR("Couldn't verify table.");

        goto out;

    }

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

healthd/BatteryMonitor.cpp

+5 −5
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ bool BatteryMonitor::update(void) { 
                 "battery none");

        }



        KLOG_INFO(LOG_TAG, "%s chg=%s%s%s\n", dmesgline,

        KLOG_WARNING(LOG_TAG, "%s chg=%s%s%s\n", dmesgline,

                     props.chargerAcOnline ? "a" : "",

                     props.chargerUsbOnline ? "u" : "",

                     props.chargerWirelessOnline ? "w" : "");
@@ -511,7 +511,7 @@ void BatteryMonitor::init(struct healthd_config *hc) { 
    if (!mChargerNames.size())

        KLOG_ERROR(LOG_TAG, "No charger supplies found\n");

    if (!mBatteryDevicePresent) {

        KLOG_INFO(LOG_TAG, "No battery devices found\n");

        KLOG_WARNING(LOG_TAG, "No battery devices found\n");

        hc->periodic_chores_interval_fast = -1;

        hc->periodic_chores_interval_slow = -1;

    } else {