commit fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226
author Nick Kralevich <nnk@google.com> Mon Dec 16 18:41:03 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 16 18:41:03 2013 +0000
tree 53b76e25cbb063653e0596d9fc30ca76ceffb204
parent c49273895ea96da5d88c806fb6acd4a92b963f84
parent 09fdc159552c85032ce9860fc0d63b6eebeca82a

am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

* commit '09fdc159552c85032ce9860fc0d63b6eebeca82a':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.

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) {