commit c95bb562e8c67c258623fe70e8001a08e59b8c7d
author Todd Poynor <toddpoynor@google.com> Fri Nov 22 17:15:49 2013 -0800
committer Todd Poynor <toddpoynor@google.com> Thu Dec 12 00:44:30 2013 +0000
tree f44bbe24a3fa5238758f64fbd05b62d4479c6917
parent b319cde435b6dd77eab7dbf788567cc5f8a02bcf

Add previous console on pstore to DropBox

Change-Id: I23c0213fe3d52280d7338ca62cb7e79b80a16cc6

services/java/com/android/server/BootReceiver.java

diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java
index da1b254..bce85ce 100644
--- a/services/java/com/android/server/BootReceiver.java
+++ b/services/java/com/android/server/BootReceiver.java
@@ -120,6 +120,8 @@
             // Negative sizes mean to take the *tail* of the file (see FileUtils.readTextFile())
             addFileToDropBox(db, prefs, headers, "/proc/last_kmsg",
                     -LOG_SIZE, "SYSTEM_LAST_KMSG");
+            addFileToDropBox(db, prefs, headers, "/sys/fs/pstore/console-ramoops",
+                    -LOG_SIZE, "SYSTEM_LAST_KMSG");
             addFileToDropBox(db, prefs, headers, "/cache/recovery/log",
                     -LOG_SIZE, "SYSTEM_RECOVERY_LOG");
             addFileToDropBox(db, prefs, headers, "/data/dontpanic/apanic_console",
@@ -184,6 +186,11 @@
 
         File file = new File("/proc/last_kmsg");
         long fileTime = file.lastModified();
+        if (fileTime <= 0) {
+            file = new File("/sys/fs/pstore/console-ramoops");
+            fileTime = file.lastModified();
+        }
+
         if (fileTime <= 0) return;  // File does not exist
 
         if (prefs != null) {