Merge "Logging atom TOMB_STONE_OCCURRED when a tombstone file added to dropbox." (368ae7ff) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,6 @@ public class BootReceiver extends BroadcastReceiver {
		if (file.isFile() && file.getName().startsWith("tombstone_")) {
		addFileToDropBox(db, timestamps, headers, file.getPath(), LOG_SIZE,
		TAG_TOMBSTONE);
		StatsLog.write(StatsLog.TOMB_STONE_OCCURRED);
		}
		} catch (IOException e) {
		Slog.e(TAG, "Can't log tombstone", e);
		@@ -308,6 +307,9 @@ public class BootReceiver extends BroadcastReceiver {
		if (tag.equals(TAG_TOMBSTONE) && fileContents.contains(">>> system_server <<<")) {
		addTextToDropBox(db, "system_server_native_crash", text, filename, maxSize);
		}
		if (tag.equals(TAG_TOMBSTONE)) {
		StatsLog.write(StatsLog.TOMB_STONE_OCCURRED);
		}
		addTextToDropBox(db, tag, text, filename, maxSize);
		}