PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14

Browse Source 
am: 4e4474c9c5

Change-Id: Iaca861be960a271c09c07deeaf4f98850edc4f71
This commit is contained in:
Tianjie Xu
2016-08-17 22:10:12 +00:00
committed by android-build-merger
parent d7865e81f1 4e4474c9c5
commit e254b4e9e4
1 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+10 -5
View File
@@ -919,17 +919,13 @@ static bool brick_device() {
} }
static void choose_recovery_file(Device* device) { 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 // "Back" + KEEP_LOG_COUNT * 2 + terminating nullptr entry
char* entries[1 + KEEP_LOG_COUNT * 2 + 1]; char* entries[1 + KEEP_LOG_COUNT * 2 + 1];
memset(entries, 0, sizeof(entries)); memset(entries, 0, sizeof(entries));
unsigned int n = 0; unsigned int n = 0;
if (has_cache) {
// Add LAST_LOG_FILE + LAST_LOG_FILE.x // Add LAST_LOG_FILE + LAST_LOG_FILE.x
// Add LAST_KMSG_FILE + LAST_KMSG_FILE.x // Add LAST_KMSG_FILE + LAST_KMSG_FILE.x
for (int i = 0; i < KEEP_LOG_COUNT; i++) { for (int i = 0; i < KEEP_LOG_COUNT; i++) {
@@ -960,6 +956,15 @@ static void choose_recovery_file(Device* device) {
entries[n++] = kmsg_file; 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"); entries[n++] = strdup("Back");