vold now deletes misc_ce/misc_de

Bug: 25861755
Test: create user, populate vold subdirectory, delete user, check logs
Change-Id: I95f2d8d52ea9cdb621b6bf0b18d6151721dcf8d9

diff --git a/services/core/java/com/android/server/pm/UserDataPreparer.java b/services/core/java/com/android/server/pm/UserDataPreparer.java
index b8b00af..bfe09b8 100644 (file)
--- a/services/core/java/com/android/server/pm/UserDataPreparer.java
+++ b/services/core/java/com/android/server/pm/UserDataPreparer.java
@@ -132,11 +132,9 @@ class UserDataPreparer {
                 if ((flags & StorageManager.FLAG_STORAGE_DE) != 0) {
                     FileUtils.deleteContentsAndDir(getUserSystemDirectory(userId));
                     FileUtils.deleteContentsAndDir(getDataSystemDeDirectory(userId));
-                    FileUtils.deleteContentsAndDir(getDataMiscDeDirectory(userId));
                 }
                 if ((flags & StorageManager.FLAG_STORAGE_CE) != 0) {
                     FileUtils.deleteContentsAndDir(getDataSystemCeDirectory(userId));
-                    FileUtils.deleteContentsAndDir(getDataMiscCeDirectory(userId));
                 }
             }
 

diff --git a/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java
index 7a676e2..bb35beb 100644 (file)
--- a/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java
@@ -154,9 +154,6 @@ public class UserDataPreparerTest {
         File systemDeDir = mUserDataPreparer.getDataSystemDeDirectory(TEST_USER_ID);
         systemDeDir.mkdirs();
         writeFile(new File(systemDeDir, "file"), "-----" );
-        File miscDeDir = mUserDataPreparer.getDataMiscDeDirectory(TEST_USER_ID);
-        miscDeDir.mkdirs();
-        writeFile(new File(miscDeDir, "file"), "-----" );
 
         mUserDataPreparer.destroyUserData(TEST_USER_ID, StorageManager.FLAG_STORAGE_DE);
 
@@ -168,8 +165,6 @@ public class UserDataPreparerTest {
         assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(systemDir)));
         assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(
                 systemDeDir)));
-        assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(
-                miscDeDir)));
     }
 
     @Test
@@ -177,9 +172,6 @@ public class UserDataPreparerTest {
         File systemCeDir = mUserDataPreparer.getDataSystemCeDirectory(TEST_USER_ID);
         systemCeDir.mkdirs();
         writeFile(new File(systemCeDir, "file"), "-----" );
-        File miscCeDir = mUserDataPreparer.getDataMiscCeDirectory(TEST_USER_ID);
-        miscCeDir.mkdirs();
-        writeFile(new File(miscCeDir, "file"), "-----" );
 
         mUserDataPreparer.destroyUserData(TEST_USER_ID, StorageManager.FLAG_STORAGE_CE);
 
@@ -190,8 +182,6 @@ public class UserDataPreparerTest {
 
         assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(
                 systemCeDir)));
-        assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(
-                miscCeDir)));
     }
 
     @Test