am f7c59190: am dea847c2: Skip over directories when iterating tombstones (cae74017) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -155,9 +155,11 @@ public class BootReceiver extends BroadcastReceiver {
		// Scan existing tombstones (in case any new ones appeared)
		File[] tombstoneFiles = TOMBSTONE_DIR.listFiles();
		for (int i = 0; tombstoneFiles != null && i < tombstoneFiles.length; i++) {
		if (tombstoneFiles[i].isFile()) {
		addFileToDropBox(db, prefs, headers, tombstoneFiles[i].getPath(),
		LOG_SIZE, "SYSTEM_TOMBSTONE");
		}
		}

		// Start watching for new tombstone files; will record them as they occur.
		// This gets registered with the singleton file observer thread.
		@@ -165,8 +167,10 @@ public class BootReceiver extends BroadcastReceiver {
		@Override
		public void onEvent(int event, String path) {
		try {
		String filename = new File(TOMBSTONE_DIR, path).getPath();
		addFileToDropBox(db, prefs, headers, filename, LOG_SIZE, "SYSTEM_TOMBSTONE");
		File file = new File(TOMBSTONE_DIR, path);
		if (file.isFile()) {
		addFileToDropBox(db, prefs, headers, file.getPath(), LOG_SIZE, "SYSTEM_TOMBSTONE");
		}
		} catch (IOException e) {
		Slog.e(TAG, "Can't log tombstone", e);
		}