am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir" (fb2927df) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -4716,15 +4716,6 @@ public final class ActivityManagerService extends ActivityManagerNative

		File tracesFile = new File(tracesPath);
		try {
		File tracesDir = tracesFile.getParentFile();
		if (!tracesDir.exists()) {
		tracesDir.mkdirs();
		if (!SELinux.restorecon(tracesDir)) {
		return null;
		}
		}
		FileUtils.setPermissions(tracesDir.getPath(), 0775, -1, -1); // drwxrwxr-x

		if (clearTraces && tracesFile.exists()) tracesFile.delete();
		tracesFile.createNewFile();
		FileUtils.setPermissions(tracesFile.getPath(), 0666, -1, -1); // -rw-rw-rw-
		@@ -4827,14 +4818,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		final File tracesDir = tracesFile.getParentFile();
		final File tracesTmp = new File(tracesDir, "__tmp__");
		try {
		if (!tracesDir.exists()) {
		tracesDir.mkdirs();
		if (!SELinux.restorecon(tracesDir.getPath())) {
		return;
		}
		}
		FileUtils.setPermissions(tracesDir.getPath(), 0775, -1, -1); // drwxrwxr-x

		if (tracesFile.exists()) {
		tracesTmp.delete();
		tracesFile.renameTo(tracesTmp);