Move boot log file writing into a background thread to avoid ANR.
Bug: 2507228
Change-Id: I35695f89f1d62b907f04511e3e6b71722008949b
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index b827af8..1b103aa 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -70,7 +70,7 @@
private static File LOG_FILE = new File(RECOVERY_DIR, "log");
// Length limits for reading files.
- private static int LOG_FILE_MAX_LENGTH = 8 * 1024;
+ private static int LOG_FILE_MAX_LENGTH = 64 * 1024;
/**
* Interface definition for a callback to be invoked regularly as
diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java
index eeb91fa..15aad0e 100644
--- a/services/java/com/android/server/BootReceiver.java
+++ b/services/java/com/android/server/BootReceiver.java
@@ -49,19 +49,7 @@
private static FileObserver sTombstoneObserver = null;
@Override
- public void onReceive(Context context, Intent intent) {
- try {
- logBootEvents(context);
- } catch (Exception e) {
- Slog.e(TAG, "Can't log boot events", e);
- }
-
- try {
- RecoverySystem.handleAftermath();
- } catch (Exception e) {
- Slog.e(TAG, "Can't handle recovery aftermath", e);
- }
-
+ public void onReceive(final Context context, Intent intent) {
try {
// Start the load average overlay, if activated
ContentResolver res = context.getContentResolver();
@@ -72,44 +60,59 @@
} catch (Exception e) {
Slog.e(TAG, "Can't start load average service", e);
}
+
+ // Log boot events in the background to avoid blocking the main thread with I/O
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ logBootEvents(context);
+ } catch (Exception e) {
+ Slog.e(TAG, "Can't log boot events", e);
+ }
+ }
+ }.start();
}
private void logBootEvents(Context ctx) throws IOException {
final DropBoxManager db = (DropBoxManager) ctx.getSystemService(Context.DROPBOX_SERVICE);
final SharedPreferences prefs = ctx.getSharedPreferences("log_files", Context.MODE_PRIVATE);
- final String props = new StringBuilder()
+ final String headers = new StringBuilder(512)
.append("Build: ").append(Build.FINGERPRINT).append("\n")
.append("Hardware: ").append(Build.BOARD).append("\n")
.append("Bootloader: ").append(Build.BOOTLOADER).append("\n")
.append("Radio: ").append(Build.RADIO).append("\n")
.append("Kernel: ")
.append(FileUtils.readTextFile(new File("/proc/version"), 1024, "...\n"))
- .toString();
+ .append("\n").toString();
- if (db == null || prefs == null) return;
+ String recovery = RecoverySystem.handleAftermath();
+ if (recovery != null && db != null) {
+ db.addText("SYSTEM_RECOVERY_LOG", headers + recovery);
+ }
if (SystemProperties.getLong("ro.runtime.firstboot", 0) == 0) {
String now = Long.toString(System.currentTimeMillis());
SystemProperties.set("ro.runtime.firstboot", now);
- db.addText("SYSTEM_BOOT", props);
+ if (db != null) db.addText("SYSTEM_BOOT", headers);
// Negative sizes mean to take the *tail* of the file (see FileUtils.readTextFile())
- addFileToDropBox(db, prefs, props, "/proc/last_kmsg",
+ addFileToDropBox(db, prefs, headers, "/proc/last_kmsg",
-LOG_SIZE, "SYSTEM_LAST_KMSG");
- addFileToDropBox(db, prefs, props, "/cache/recovery/log",
+ addFileToDropBox(db, prefs, headers, "/cache/recovery/log",
-LOG_SIZE, "SYSTEM_RECOVERY_LOG");
- addFileToDropBox(db, prefs, props, "/data/dontpanic/apanic_console",
+ addFileToDropBox(db, prefs, headers, "/data/dontpanic/apanic_console",
-LOG_SIZE, "APANIC_CONSOLE");
- addFileToDropBox(db, prefs, props, "/data/dontpanic/apanic_threads",
+ addFileToDropBox(db, prefs, headers, "/data/dontpanic/apanic_threads",
-LOG_SIZE, "APANIC_THREADS");
} else {
- db.addText("SYSTEM_RESTART", props);
+ if (db != null) db.addText("SYSTEM_RESTART", headers);
}
// Scan existing tombstones (in case any new ones appeared)
File[] tombstoneFiles = TOMBSTONE_DIR.listFiles();
for (int i = 0; tombstoneFiles != null && i < tombstoneFiles.length; i++) {
- addFileToDropBox(db, prefs, props, tombstoneFiles[i].getPath(),
+ addFileToDropBox(db, prefs, headers, tombstoneFiles[i].getPath(),
LOG_SIZE, "SYSTEM_TOMBSTONE");
}
@@ -120,7 +123,7 @@
public void onEvent(int event, String path) {
try {
String filename = new File(TOMBSTONE_DIR, path).getPath();
- addFileToDropBox(db, prefs, props, filename, LOG_SIZE, "SYSTEM_TOMBSTONE");
+ addFileToDropBox(db, prefs, headers, filename, LOG_SIZE, "SYSTEM_TOMBSTONE");
} catch (IOException e) {
Slog.e(TAG, "Can't log tombstone", e);
}
@@ -133,19 +136,19 @@
private static void addFileToDropBox(
DropBoxManager db, SharedPreferences prefs,
String headers, String filename, int maxSize, String tag) throws IOException {
- if (!db.isTagEnabled(tag)) return; // Slog.ing disabled
+ if (db == null || !db.isTagEnabled(tag)) return; // Logging disabled
File file = new File(filename);
long fileTime = file.lastModified();
if (fileTime <= 0) return; // File does not exist
- long lastTime = prefs.getLong(filename, 0);
- if (lastTime == fileTime) return; // Already logged this particular file
- prefs.edit().putLong(filename, fileTime).commit();
+ if (prefs != null) {
+ long lastTime = prefs.getLong(filename, 0);
+ if (lastTime == fileTime) return; // Already logged this particular file
+ prefs.edit().putLong(filename, fileTime).commit();
+ }
- StringBuilder report = new StringBuilder(headers).append("\n");
- report.append(FileUtils.readTextFile(file, maxSize, "[[TRUNCATED]]\n"));
- db.addText(tag, report.toString());
- Slog.i(TAG, "Slog.ing " + filename + " to DropBox (" + tag + ")");
+ Slog.i(TAG, "Copying " + filename + " to DropBox (" + tag + ")");
+ db.addText(tag, headers + FileUtils.readTextFile(file, maxSize, "[[TRUNCATED]]\n"));
}
}
