From 18c139c57f104c90e8003dd9e54142b41b9b6c24 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 14 Jul 2017 13:08:47 -0700 Subject: [PATCH] BootReceiver: check console-ramoops-0 On later kernels /sys/fs/pstore/console-ramoops becomes /sys/fs/pstore/console-ramoops-0 Test: none Bug: 63058217 Change-Id: Ia68c0b5741c35cb35f10be6bbce93e0f0c92480f --- core/java/com/android/server/BootReceiver.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/com/android/server/BootReceiver.java b/core/java/com/android/server/BootReceiver.java index 5a50fbfd52778..9151cee84986a 100644 --- a/core/java/com/android/server/BootReceiver.java +++ b/core/java/com/android/server/BootReceiver.java @@ -195,6 +195,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", @@ -276,6 +278,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