diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-12-12 00:53:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-12 00:53:07 +0000 |
| commit | 84c3d2a7de0a8055bdfdccbd93cfd216b8ab6bcd (patch) | |
| tree | a22bde51ec4244f227d4a7082b1e4b8abf719b89 | |
| parent | 19b9c1498e31c3b2ac45955f8344c75e40d9b876 (diff) | |
| parent | c52afd2532737872e97933ad1cfb214d4382091f (diff) | |
| download | frameworks_base-84c3d2a7de0a8055bdfdccbd93cfd216b8ab6bcd.zip frameworks_base-84c3d2a7de0a8055bdfdccbd93cfd216b8ab6bcd.tar.gz frameworks_base-84c3d2a7de0a8055bdfdccbd93cfd216b8ab6bcd.tar.bz2 | |
am c52afd25: am c95bb562: Add previous console on pstore to DropBox
* commit 'c52afd2532737872e97933ad1cfb214d4382091f':
Add previous console on pstore to DropBox
| -rw-r--r-- | services/java/com/android/server/BootReceiver.java | 7 |
1 files changed, 7 insertions, 0 deletions
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 @@ public class BootReceiver extends BroadcastReceiver { // 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 @@ public class BootReceiver extends BroadcastReceiver { 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) { |