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

Commit a44d4355 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

"view recovery logs" will show /tmp/recovery.log

am: 62ab2a0f

Change-Id: I6acbbfd21b370df044413c4d15414b612b5654bb
parents 0d345b67 62ab2a0f
Loading
Loading
Loading
Loading
+36 −31
Original line number Diff line number Diff line
@@ -1014,17 +1014,13 @@ static bool wipe_ab_device(size_t wipe_package_size) {
}

static void choose_recovery_file(Device* device) {
    if (!has_cache) {
        ui->Print("No /cache partition found.\n");
        return;
    }

    // "Back" + KEEP_LOG_COUNT * 2 + terminating nullptr entry
    char* entries[1 + KEEP_LOG_COUNT * 2 + 1];
    memset(entries, 0, sizeof(entries));

    unsigned int n = 0;

    if (has_cache) {
        // Add LAST_LOG_FILE + LAST_LOG_FILE.x
        // Add LAST_KMSG_FILE + LAST_KMSG_FILE.x
        for (int i = 0; i < KEEP_LOG_COUNT; i++) {
@@ -1055,6 +1051,15 @@ static void choose_recovery_file(Device* device) {
                entries[n++] = kmsg_file;
            }
        }
    } else {
        // If cache partition is not found, view /tmp/recovery.log instead.
        ui->Print("No /cache partition found.\n");
        if (access(TEMPORARY_LOG_FILE, R_OK) == -1) {
            return;
        } else{
            entries[n++] = strdup(TEMPORARY_LOG_FILE);
        }
    }

    entries[n++] = strdup("Back");