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

Commit b6c5df1a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Shift to measure per-userId OBB directories."

parents d2ecb31e 6d775c58

cmds/installd/InstalldNativeService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1648,7 +1648,8 @@ binder::Status InstalldNativeService::getAppSize(const std::unique_ptr<std::stri 


    ATRACE_BEGIN("obb");

    for (const auto& packageName : packageNames) {

        auto obbCodePath = create_data_media_obb_path(uuid_, packageName.c_str());

        auto obbCodePath = create_data_media_package_path(uuid_, userId,

                "obb", packageName.c_str());

        calculate_tree_size(obbCodePath, &extStats.codeSize);

    }

    ATRACE_END();
@@ -1982,7 +1983,8 @@ binder::Status InstalldNativeService::getExternalSize(const std::unique_ptr<std: 
        ATRACE_END();



        ATRACE_BEGIN("obb");

        auto obbPath = create_data_media_obb_path(uuid_, "");

        auto obbPath = StringPrintf("%s/Android/obb",

                create_data_media_path(uuid_, userId).c_str());

        calculate_tree_size(obbPath, &obbSize);

        ATRACE_END();

    }

cmds/installd/utils.cpp

+0 −4
Original line number Diff line number Diff line
@@ -244,10 +244,6 @@ std::string create_data_media_path(const char* volume_uuid, userid_t userid) { 
    return StringPrintf("%s/media/%u", create_data_path(volume_uuid).c_str(), userid);

}



std::string create_data_media_obb_path(const char* volume_uuid, const char* package_name) {

    return StringPrintf("%s/media/obb/%s", create_data_path(volume_uuid).c_str(), package_name);

}



std::string create_data_media_package_path(const char* volume_uuid, userid_t userid,

        const char* data_type, const char* package_name) {

    return StringPrintf("%s/Android/%s/%s", create_data_media_path(volume_uuid, userid).c_str(),

cmds/installd/utils.h

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ std::string create_data_misc_de_rollback_package_path(const char* volume_uuid, 
        userid_t user, int32_t snapshot_id, const char* package_name);



std::string create_data_media_path(const char* volume_uuid, userid_t userid);

std::string create_data_media_obb_path(const char* volume_uuid, const char* package_name);

std::string create_data_media_package_path(const char* volume_uuid, userid_t userid,

        const char* data_type, const char* package_name);