drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include more verbose device information with kernel dumps

Browse Source 
(hardware, bootloader, etc.), and separate the device info
headers from the actual dump with a blank line.
This commit is contained in:
Dan Egnor
2010-01-26 17:00:36 -08:00
parent 66c40e7366
commit 2242da5a4f
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/BootReceiver.java
View File

@ -89,14 +89,14 @@ public class BootReceiver extends BroadcastReceiver {
}
ContentResolver cr = context.getContentResolver();
logBootFile(cr, db, "/cache/recovery/log", "SYSTEM_RECOVERY_LOG");
logBootFile(cr, db, "/proc/last_kmsg", "SYSTEM_LAST_KMSG");
logBootFile(cr, db, "/data/dontpanic/apanic_console", "APANIC_CONSOLE");
logBootFile(cr, db, "/data/dontpanic/apanic_threads", "APANIC_THREADS");
logBootFile(cr, db, props, "/cache/recovery/log", "SYSTEM_RECOVERY_LOG");
logBootFile(cr, db, props, "/proc/last_kmsg", "SYSTEM_LAST_KMSG");
logBootFile(cr, db, props, "/data/dontpanic/apanic_console", "APANIC_CONSOLE");
logBootFile(cr, db, props, "/data/dontpanic/apanic_threads", "APANIC_THREADS");
}
private void logBootFile(ContentResolver cr, DropBoxManager db, String filename, String tag)
throws IOException {
private void logBootFile(ContentResolver cr, DropBoxManager db,
CharSequence headers, String filename, String tag) throws IOException {
if (cr == null || db == null || !db.isTagEnabled(tag)) return; // Logging disabled
File file = new File(filename);
@ -108,10 +108,8 @@ public class BootReceiver extends BroadcastReceiver {
if (lastTime == fileTime) return; // Already logged this particular file
Settings.Secure.putLong(cr, setting, fileTime);
StringBuilder report = new StringBuilder();
report.append("Build: ").append(Build.FINGERPRINT).append("\n");
report.append("Kernel: ");
report.append(FileUtils.readTextFile(new File("/proc/version"), 1024, "...\n"));
StringBuilder report = new StringBuilder(headers);
report.append("\n");
report.append(FileUtils.readTextFile(new File(filename), LOG_SIZE, "[[TRUNCATED]]\n"));
db.addText(tag, report.toString());
}