commit 107d9d93d3c164f14ab38402050a50f87e8229e5
author The Android Automerger <android-build@google.com> Sun Jun 26 00:03:29 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 26 00:03:29 2016 -0700
tree f93e8f6ee4ebfd58195abd196716be2f48f5ab2d
parent ced6078b0e03a75d9b78e61ce25609bd2cb97b1d
parent 5ef935e1910370371ca910a5384e811418854c66

merge in nyc-release history after reset to nyc-dev

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 5fe1f90..5c31d6b 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -67,6 +67,7 @@
 static std::string suffix;
 
 #define PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops"
+#define ALT_PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops-0"
 
 #define RAFT_DIR "/data/misc/raft/"
 #define RECOVERY_DIR "/cache/recovery"
@@ -779,6 +780,8 @@
     if (!stat(PSTORE_LAST_KMSG, &st)) {
         /* Also TODO: Make console-ramoops CAP_SYSLOG protected. */
         dump_file("LAST KMSG", PSTORE_LAST_KMSG);
+    } else if (!stat(ALT_PSTORE_LAST_KMSG, &st)) {
+        dump_file("LAST KMSG", ALT_PSTORE_LAST_KMSG);
     } else {
         /* TODO: Make last_kmsg CAP_SYSLOG protected. b/5555691 */
         dump_file("LAST KMSG", "/proc/last_kmsg");