diff options
| -rw-r--r-- | core/java/android/os/Environment.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 8d9ceb6ac58c..7cdb3cec5dbb 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -272,6 +272,11 @@ public class Environment { } /** {@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)); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 23a6a9029dc8..abf352670521 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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; |