Merge "Add proto tombstones to dropbox directly." into sc-dev (131ed898) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/BootReceiver.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -479,9 +479,13 @@ public class BootReceiver extends BroadcastReceiver {
		final String bootReason = SystemProperties.get("ro.boot.bootreason", null);
		HashMap<String, Long> timestamps = readTimestamps();
		try {
		if (proto) {
		db.addFile(TAG_TOMBSTONE_PROTO, tombstone, 0);
		} else {
		final String headers = getBootHeadersToLogAndUpdate();
		addFileToDropBox(db, timestamps, headers, tombstone.getPath(), LOG_SIZE,
		proto ? TAG_TOMBSTONE_PROTO : TAG_TOMBSTONE);
		TAG_TOMBSTONE);
		}
		} catch (IOException e) {
		Slog.e(TAG, "Can't log tombstone", e);
		}