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

Commit 331bea0b authored by Rishabh Singh's avatar Rishabh Singh Committed by Samiul Islam
Browse files

Destroy SdkSandbox User Data 

In installd's destroyUserData function we need to take care of destroying the sdksandbox directories associated with user data
alongwith some minor test changes in installd

Bug: 222698779
Test: atest DestroyUserDataTest
Ignore-AOSP-First: Feature is being developed in internal branch
Change-Id: I11248f6bed2740f7605a6d7294d266e0bfefcfef
Merged-In: I11248f6bed2740f7605a6d7294d266e0bfefcfef
(cherry picked from commit 8d78437e)
parent 1644473e

cmds/installd/InstalldNativeService.cpp

+10 −0
Original line number Original line Diff line number Diff line
@@ -1900,6 +1900,11 @@ binder::Status InstalldNativeService::destroyUserData(const std::optional<std::s 
        if (delete_dir_contents_and_dir(path, true) != 0) {

        if (delete_dir_contents_and_dir(path, true) != 0) {

            res = error("Failed to delete " + path);

            res = error("Failed to delete " + path);

        }

        }

        auto sdk_sandbox_de_path =

                create_data_misc_sdk_sandbox_path(uuid_, /*isCeData=*/false, userId);

        if (delete_dir_contents_and_dir(sdk_sandbox_de_path, true) != 0) {

            res = error("Failed to delete " + sdk_sandbox_de_path);

        }

        if (uuid_ == nullptr) {

        if (uuid_ == nullptr) {

            path = create_data_misc_legacy_path(userId);

            path = create_data_misc_legacy_path(userId);

            if (delete_dir_contents_and_dir(path, true) != 0) {

            if (delete_dir_contents_and_dir(path, true) != 0) {
@@ -1916,6 +1921,11 @@ binder::Status InstalldNativeService::destroyUserData(const std::optional<std::s 
        if (delete_dir_contents_and_dir(path, true) != 0) {

        if (delete_dir_contents_and_dir(path, true) != 0) {

            res = error("Failed to delete " + path);

            res = error("Failed to delete " + path);

        }

        }

        auto sdk_sandbox_ce_path =

                create_data_misc_sdk_sandbox_path(uuid_, /*isCeData=*/true, userId);

        if (delete_dir_contents_and_dir(sdk_sandbox_ce_path, true) != 0) {

            res = error("Failed to delete " + sdk_sandbox_ce_path);

        }

        path = findDataMediaPath(uuid, userId);

        path = findDataMediaPath(uuid, userId);

        if (delete_dir_contents_and_dir(path, true) != 0) {

        if (delete_dir_contents_and_dir(path, true) != 0) {

            res = error("Failed to delete " + path);

            res = error("Failed to delete " + path);

cmds/installd/tests/installd_service_test.cpp

+27 −12
Original line number Original line Diff line number Diff line
@@ -1062,7 +1062,7 @@ public: 
        args.userId = kTestUserId;

        args.userId = kTestUserId;

        args.appId = kTestAppId;

        args.appId = kTestAppId;

        args.seInfo = "default";

        args.seInfo = "default";

        args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE;

        args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

        return args;

        return args;

    }

    }
@@ -1120,7 +1120,6 @@ private: 
TEST_F(SdkSandboxDataTest, CreateAppData_CreatesSdkPackageData) {

TEST_F(SdkSandboxDataTest, CreateAppData_CreatesSdkPackageData) {

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;





    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));
@@ -1157,7 +1156,6 @@ TEST_F(SdkSandboxDataTest, CreateAppData_CreatesSdkAppLevelData_WithoutSdkFlag) 
TEST_F(SdkSandboxDataTest, CreateAppData_CreatesSdkAppLevelData_WithoutSdkFlagDeletesExisting) {

TEST_F(SdkSandboxDataTest, CreateAppData_CreatesSdkAppLevelData_WithoutSdkFlagDeletesExisting) {

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_TRUE(exists("/data/local/tmp/misc_ce/0/sdksandbox/com.foo"));

    ASSERT_TRUE(exists("/data/local/tmp/misc_ce/0/sdksandbox/com.foo"));
@@ -1307,7 +1305,6 @@ TEST_F(DestroyAppDataTest, DestroySdkSandboxDataDirectories_WithCeAndDeFlag) { 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    // Destroy the app user data.

    // Destroy the app user data.
@@ -1321,7 +1318,6 @@ TEST_F(DestroyAppDataTest, DestroySdkSandboxDataDirectories_WithoutDeFlag) { 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    // Destroy the app user data.

    // Destroy the app user data.
@@ -1335,7 +1331,6 @@ TEST_F(DestroyAppDataTest, DestroySdkSandboxDataDirectories_WithoutCeFlag) { 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    // Destroy the app user data.

    // Destroy the app user data.
@@ -1372,7 +1367,6 @@ TEST_F(ClearAppDataTest, ClearSdkSandboxDataDirectories_WithCeAndClearCacheFlag) 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    createTestSdkData("com.foo", {"sdk1", "sdk2"});

    createTestSdkData("com.foo", {"sdk1", "sdk2"});
@@ -1391,7 +1385,6 @@ TEST_F(ClearAppDataTest, ClearSdkSandboxDataDirectories_WithCeAndClearCodeCacheF 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    createTestSdkData("com.foo", {"sdk1", "sdk2"});

    createTestSdkData("com.foo", {"sdk1", "sdk2"});
@@ -1413,7 +1406,6 @@ TEST_F(ClearAppDataTest, ClearSdkSandboxDataDirectories_WithDeAndClearCacheFlag) 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    createTestSdkData("com.foo", {"sdk1", "sdk2"});

    createTestSdkData("com.foo", {"sdk1", "sdk2"});
@@ -1432,7 +1424,6 @@ TEST_F(ClearAppDataTest, ClearSdkSandboxDataDirectories_WithDeAndClearCodeCacheF 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    createTestSdkData("com.foo", {"sdk1", "sdk2"});

    createTestSdkData("com.foo", {"sdk1", "sdk2"});
@@ -1454,7 +1445,6 @@ TEST_F(ClearAppDataTest, ClearSdkSandboxDataDirectories_WithCeAndWithoutAnyCache 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    createTestSdkData("com.foo", {"sdk1", "sdk2"});

    createTestSdkData("com.foo", {"sdk1", "sdk2"});
@@ -1470,7 +1460,6 @@ TEST_F(ClearAppDataTest, ClearSdkSandboxDataDirectories_WithDeAndWithoutAnyCache 
    android::os::CreateAppDataResult result;

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    args.packageName = "com.foo";

    args.flags = FLAG_STORAGE_CE | FLAG_STORAGE_DE | FLAG_STORAGE_SDK;

    // Create the app user data.

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    createTestSdkData("com.foo", {"sdk1", "sdk2"});

    createTestSdkData("com.foo", {"sdk1", "sdk2"});
@@ -1482,5 +1471,31 @@ TEST_F(ClearAppDataTest, ClearSdkSandboxDataDirectories_WithDeAndWithoutAnyCache 
    ASSERT_TRUE(fs::is_empty(fs::path("/data/local/tmp/misc_de/0/sdksandbox/com.foo/sdk2")));

    ASSERT_TRUE(fs::is_empty(fs::path("/data/local/tmp/misc_de/0/sdksandbox/com.foo/sdk2")));

}

}





class DestroyUserDataTest : public SdkSandboxDataTest {};



TEST_F(DestroyUserDataTest, DestroySdkData_WithCeFlag) {

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    // Destroy user data

    ASSERT_BINDER_SUCCESS(service->destroyUserData(args.uuid, args.userId, FLAG_STORAGE_CE));

    ASSERT_FALSE(exists("/data/local/tmp/misc_ce/0/sdksandbox"));

    ASSERT_TRUE(exists("/data/local/tmp/misc_de/0/sdksandbox"));

}



TEST_F(DestroyUserDataTest, DestroySdkData_WithDeFlag) {

    android::os::CreateAppDataResult result;

    android::os::CreateAppDataArgs args = createAppDataArgs("com.foo");

    args.packageName = "com.foo";

    // Create the app user data.

    ASSERT_BINDER_SUCCESS(service->createAppData(args, &result));

    // Destroy user data

    ASSERT_BINDER_SUCCESS(service->destroyUserData(args.uuid, args.userId, FLAG_STORAGE_DE));

    ASSERT_TRUE(exists("/data/local/tmp/misc_ce/0/sdksandbox"));

    ASSERT_FALSE(exists("/data/local/tmp/misc_de/0/sdksandbox"));

}



}  // namespace installd

}  // namespace installd

}  // namespace android
 
}  // namespace android