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

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

Browse Source 
For A/B devices, "view recovery logs" doesn't work due to the lack
of cache partition. To help debugging, we'll show /tmp/recovery.log
instead if /cache is not found.

Change-Id: Idb77c3a4c30388148a210b38d732a7b27e757bba
Test: Tested on an A/B device and /tmp/recovery.log showed up.
Bug: 30905700
(cherry picked from commit a54f75ede8)
This commit is contained in:
Tianjie Xu
2016-08-17 12:02:46 -07:00
parent 53c107f068
commit 62ab2a0fbc
1 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
recovery.cpp
View File

@@ -1014,45 +1014,50 @@ static bool wipe_ab_device(size_t wipe_package_size) {
} }
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;
// Add LAST_LOG_FILE + LAST_LOG_FILE.x if (has_cache) {
// Add LAST_KMSG_FILE + LAST_KMSG_FILE.x // Add LAST_LOG_FILE + LAST_LOG_FILE.x
for (int i = 0; i < KEEP_LOG_COUNT; i++) { // Add LAST_KMSG_FILE + LAST_KMSG_FILE.x
char* log_file; for (int i = 0; i < KEEP_LOG_COUNT; i++) {
int ret; char* log_file;
ret = (i == 0) ? asprintf(&log_file, "%s", LAST_LOG_FILE) : int ret;
asprintf(&log_file, "%s.%d", LAST_LOG_FILE, i); ret = (i == 0) ? asprintf(&log_file, "%s", LAST_LOG_FILE) :
if (ret == -1) { asprintf(&log_file, "%s.%d", LAST_LOG_FILE, i);
// memory allocation failure - return early. Should never happen. if (ret == -1) {
return; // memory allocation failure - return early. Should never happen.
} return;
if ((ensure_path_mounted(log_file) != 0) || (access(log_file, R_OK) == -1)) { }
free(log_file); if ((ensure_path_mounted(log_file) != 0) || (access(log_file, R_OK) == -1)) {
} else { free(log_file);
entries[n++] = log_file; } else {
} entries[n++] = log_file;
}
char* kmsg_file; char* kmsg_file;
ret = (i == 0) ? asprintf(&kmsg_file, "%s", LAST_KMSG_FILE) : ret = (i == 0) ? asprintf(&kmsg_file, "%s", LAST_KMSG_FILE) :
asprintf(&kmsg_file, "%s.%d", LAST_KMSG_FILE, i); asprintf(&kmsg_file, "%s.%d", LAST_KMSG_FILE, i);
if (ret == -1) { if (ret == -1) {
// memory allocation failure - return early. Should never happen. // memory allocation failure - return early. Should never happen.
return; return;
}
if ((ensure_path_mounted(kmsg_file) != 0) || (access(kmsg_file, R_OK) == -1)) {
free(kmsg_file);
} else {
entries[n++] = kmsg_file;
}
} }
if ((ensure_path_mounted(kmsg_file) != 0) || (access(kmsg_file, R_OK) == -1)) { } else {
free(kmsg_file); // If cache partition is not found, view /tmp/recovery.log instead.
} else { ui->Print("No /cache partition found.\n");
entries[n++] = kmsg_file; if (access(TEMPORARY_LOG_FILE, R_OK) == -1) {
return;
} else{
entries[n++] = strdup(TEMPORARY_LOG_FILE);
} }
} }