Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "vold now deletes misc_ce/misc_de"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-24 22:15:58 +00:00
committed by Android (Google) Code Review
parent 18de91260b 4b8a624224
commit f59e966637
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/UserDataPreparer.java
View File

@@ -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));
}
}

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

@@ -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