commit a0ce4e288073b744a02e4301e7ec069346c416d7
author Nick Kralevich <nnk@google.com> Thu Dec 19 18:40:45 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 19 18:40:45 2013 +0000
tree fd9159d72ca1e65d549f52665fae2d35b5aaec15
parent b37b53bf0775cabdfac05dd1d644f85b6f830005
parent 98fdcfa9817bf54a8695c57366f4ff047ceddb85

am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."

* commit '98fdcfa9817bf54a8695c57366f4ff047ceddb85':
  adb: Check sender's socket id when receiving packets.

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index 66ddeaf..dda24ae 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -67,6 +67,7 @@
 #define BATTERY_FULL_THRESH     95
 
 #define LAST_KMSG_PATH          "/proc/last_kmsg"
+#define LAST_KMSG_PSTORE_PATH   "/sys/fs/pstore/console-ramoops"
 #define LAST_KMSG_MAX_SZ        (32 * 1024)
 
 #define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)
@@ -211,10 +212,14 @@
     LOGI("\n");
     LOGI("*************** LAST KMSG ***************\n");
     LOGI("\n");
-    buf = load_file(LAST_KMSG_PATH, &sz);
+    buf = load_file(LAST_KMSG_PSTORE_PATH, &sz);
+
     if (!buf || !sz) {
-        LOGI("last_kmsg not found. Cold reset?\n");
-        goto out;
+        buf = load_file(LAST_KMSG_PATH, &sz);
+        if (!buf || !sz) {
+            LOGI("last_kmsg not found. Cold reset?\n");
+            goto out;
+        }
     }
 
     len = min(sz, LAST_KMSG_MAX_SZ);