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

Merge "UserDataPreparer: only delete contents of user's system CE and DE dirs" am: 697b47b692

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2077725

Change-Id: I73c654436e48d08a48447984f4e0ac44b072626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2022-05-02 20:54:35 +00:00
committed by Automerger Merge Worker
parent abcd609251 697b47b692
commit 98dcbed98a
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,14 +150,18 @@ class UserDataPreparer {
if (Objects.equals(volumeUuid, StorageManager.UUID_PRIVATE_INTERNAL)) {
if ((flags & StorageManager.FLAG_STORAGE_DE) != 0) {
FileUtils.deleteContentsAndDir(getUserSystemDirectory(userId));
FileUtils.deleteContentsAndDir(getDataSystemDeDirectory(userId));
// Delete the contents of /data/system_de/$userId, but not the directory itself
// since vold is responsible for that and system_server isn't allowed to do it.
FileUtils.deleteContents(getDataSystemDeDirectory(userId));
}
if ((flags & StorageManager.FLAG_STORAGE_CE) != 0) {
FileUtils.deleteContentsAndDir(getDataSystemCeDirectory(userId));
// Likewise, delete the contents of /data/system_ce/$userId but not the
// directory itself.
FileUtils.deleteContents(getDataSystemCeDirectory(userId));
}
}
// Data with special labels is now gone, so finish the job
// All the user's data directories should be empty now, so finish the job.
storage.destroyUserStorage(volumeUuid, userId, flags);
} catch (Exception e) {

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

@@ -17,6 +17,8 @@
package com.android.server.pm;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.verify;
@@ -129,22 +131,16 @@ public class UserDataPreparerTest {
}
@Test
public void testDestroyUserData() throws Exception {
// Add file in CE
public void testDestroyUserData_De_DoesNotDestroyCe() throws Exception {
// Add file in CE storage
File systemCeDir = mUserDataPreparer.getDataSystemCeDirectory(TEST_USER_ID);
systemCeDir.mkdirs();
File ceFile = new File(systemCeDir, "file");
writeFile(ceFile, "-----" );
testDestroyUserData_De();
// CE directory should be preserved
// Destroy DE storage, then verify that CE storage wasn't destroyed too.
mUserDataPreparer.destroyUserData(TEST_USER_ID, StorageManager.FLAG_STORAGE_DE);
assertEquals(Collections.singletonList(ceFile), Arrays.asList(FileUtils.listFilesOrEmpty(
systemCeDir)));
testDestroyUserData_Ce();
// Verify that testDir is empty
assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(
mUserDataPreparer.testDir)));
}
@Test
@@ -163,7 +159,13 @@ public class UserDataPreparerTest {
verify(mStorageManagerMock).destroyUserStorage(isNull(String.class), eq(TEST_USER_ID),
eq(StorageManager.FLAG_STORAGE_DE));
assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(systemDir)));
// systemDir (normal path: /data/system/users/$userId) should have been deleted.
assertFalse(systemDir.exists());
// systemDeDir (normal path: /data/system_de/$userId) should still exist but be empty, since
// UserDataPreparer itself is responsible for deleting the contents of this directory, but
// it delegates to StorageManager.destroyUserStorage() for deleting the directory itself.
// We've mocked out StorageManager, so StorageManager.destroyUserStorage() will be a no-op.
assertTrue(systemDeDir.exists());
assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(
systemDeDir)));
}
@@ -181,6 +183,11 @@ public class UserDataPreparerTest {
verify(mStorageManagerMock).destroyUserStorage(isNull(String.class), eq(TEST_USER_ID),
eq(StorageManager.FLAG_STORAGE_CE));
// systemCeDir (normal path: /data/system_ce/$userId) should still exist but be empty, since
// UserDataPreparer itself is responsible for deleting the contents of this directory, but
// it delegates to StorageManager.destroyUserStorage() for deleting the directory itself.
// We've mocked out StorageManager, so StorageManager.destroyUserStorage() will be a no-op.
assertTrue(systemCeDir.exists());
assertEquals(Collections.emptyList(), Arrays.asList(FileUtils.listFilesOrEmpty(
systemCeDir)));
}