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

Merge "BootReceiver: check console-ramoops-0"

Browse Source 
am: a09784ac75

Change-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de
This commit is contained in:
Mark Salyzyn
2017-07-17 22:34:23 +00:00
committed by android-build-merger
parent 5c15f6d6b1 a09784ac75
commit e7715b35ea
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

@@ -218,6 +218,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",
@@ -303,6 +305,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