Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f59e9666 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "vold now deletes misc_ce/misc_de"

parents 18de9126 4b8a6242

services/core/java/com/android/server/pm/UserDataPreparer.java

+0 −2
Original line number Diff line number Diff line
@@ -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));

                }

            }

services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java

+0 −10
Original line number Diff line number Diff line
@@ -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