Merge "Clear up /data/misc_ce/user folder on delete and reboot" (eea27893) · Commits · e / os / android_frameworks_base

core/java/android/os/Environment.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -271,6 +271,11 @@ public class Environment {
		return new File(getDataDirectory(), "misc");
		}

		/** {@hide} */
		public static File getDataMiscCeDirectory() {
		return buildPath(getDataDirectory(), "misc_ce");
		}

		/** {@hide} */
		public static File getDataMiscCeDirectory(int userId) {
		return buildPath(getDataDirectory(), "misc_ce", String.valueOf(userId));

+4 −0

Original line number	Diff line number	Diff line
		@@ -21333,9 +21333,11 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		if ((flags & StorageManager.FLAG_STORAGE_DE) != 0) {
		FileUtils.deleteContentsAndDir(Environment.getUserSystemDirectory(userId));
		FileUtils.deleteContentsAndDir(Environment.getDataSystemDeDirectory(userId));
		FileUtils.deleteContentsAndDir(Environment.getDataMiscDeDirectory(userId));
		}
		if ((flags & StorageManager.FLAG_STORAGE_CE) != 0) {
		FileUtils.deleteContentsAndDir(Environment.getDataSystemCeDirectory(userId));
		FileUtils.deleteContentsAndDir(Environment.getDataMiscCeDirectory(userId));
		}
		}

		@@ -21363,6 +21365,8 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		.listFilesOrEmpty(Environment.getDataSystemDeDirectory()));
		Collections.addAll(files, FileUtils
		.listFilesOrEmpty(Environment.getDataSystemCeDirectory()));
		Collections.addAll(files, FileUtils
		.listFilesOrEmpty(Environment.getDataMiscCeDirectory()));
		for (File file : files) {
		if (!file.isDirectory()) continue;