From fefefbb17542a48f76aaabac42b376967bbcd3ed Mon Sep 17 00:00:00 2001 From: Ken Sumrall Date: Thu, 12 Sep 2013 19:34:36 -0700 Subject: [PATCH] Upload fsck logs to the dropbox when error found If fsck made changes to the filesystem, then upload the logs to the dropbox. We can then get them into Android Problem Reports. Bug: 10021342 Change-Id: I202d2b2ba4060a2f379ca78f1b3f2c7a3f5796e0 --- .../java/com/android/server/BootReceiver.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java index 3dade3733bb6e..da1b2548238f1 100644 --- a/services/java/com/android/server/BootReceiver.java +++ b/services/java/com/android/server/BootReceiver.java @@ -127,6 +127,7 @@ public class BootReceiver extends BroadcastReceiver { addFileToDropBox(db, prefs, headers, "/data/dontpanic/apanic_threads", -LOG_SIZE, "APANIC_THREADS"); addAuditErrorsToDropBox(db, prefs, headers, -LOG_SIZE, "SYSTEM_AUDIT"); + addFsckErrorsToDropBox(db, prefs, headers, -LOG_SIZE, "SYSTEM_FSCK"); } else { if (db != null) db.addText("SYSTEM_RESTART", headers); } @@ -203,4 +204,31 @@ public class BootReceiver extends BroadcastReceiver { Slog.i(TAG, "Copied " + sb.toString().length() + " worth of audits to DropBox"); db.addText(tag, headers + sb.toString()); } + + private static void addFsckErrorsToDropBox(DropBoxManager db, SharedPreferences prefs, + String headers, int maxSize, String tag) throws IOException { + boolean upload_needed = false; + if (db == null || !db.isTagEnabled(tag)) return; // Logging disabled + Slog.i(TAG, "Checking for fsck errors"); + + File file = new File("/dev/fscklogs/log"); + long fileTime = file.lastModified(); + if (fileTime <= 0) return; // File does not exist + + String log = FileUtils.readTextFile(file, maxSize, "[[TRUNCATED]]\n"); + StringBuilder sb = new StringBuilder(); + for (String line : log.split("\n")) { + if (line.contains("FILE SYSTEM WAS MODIFIED")) { + upload_needed = true; + break; + } + } + + if (upload_needed) { + addFileToDropBox(db, prefs, headers, "/dev/fscklogs/log", maxSize, tag); + } + + // Remove the file so we don't re-upload if the runtime restarts. + file.delete(); + } }