Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BootReceiver: check console-ramoops-0" am: a09784ac75 am: e7715b35ea

Browse Source 
am: be25a82472

Change-Id: I389d8faf7d30b48bfafac17251216346eb9cb713
This commit is contained in:
Mark Salyzyn
2017-07-17 22:58:35 +00:00
committed by android-build-merger
parent d730ad43d5 be25a82472
commit 72c54c5113
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/server/BootReceiver.java
View File

@@ -217,6 +217,8 @@ public class BootReceiver extends BroadcastReceiver {
"/proc/last_kmsg", -LOG_SIZE, "SYSTEM_LAST_KMSG");
addFileWithFootersToDropBox(db, timestamps, headers, lastKmsgFooter,
"/sys/fs/pstore/console-ramoops", -LOG_SIZE, "SYSTEM_LAST_KMSG");
addFileWithFootersToDropBox(db, timestamps, headers, lastKmsgFooter,
"/sys/fs/pstore/console-ramoops-0", -LOG_SIZE, "SYSTEM_LAST_KMSG");
addFileToDropBox(db, timestamps, headers, "/cache/recovery/log", -LOG_SIZE,
"SYSTEM_RECOVERY_LOG");
addFileToDropBox(db, timestamps, headers, "/cache/recovery/last_kmsg",
@@ -302,6 +304,10 @@ public class BootReceiver extends BroadcastReceiver {
if (fileTime <= 0) {
file = new File("/sys/fs/pstore/console-ramoops");
fileTime = file.lastModified();
if (fileTime <= 0) {
file = new File("/sys/fs/pstore/console-ramoops-0");
fileTime = file.lastModified();
}
}
if (fileTime <= 0) return; // File does not exist