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

Commit 53c1004b authored by Arthur Eubanks's avatar Arthur Eubanks Committed by android-build-merger
Browse files

Merge changes I06bea24c,I8e2e24af 

am: c7cbe12c

Change-Id: I4d69c8516ca5f63480fb9a1d04dfe5f795af2b75
parents c1a3a735 c7cbe12c

cmds/installd/InstalldNativeService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static int prepare_app_quota(const std::unique_ptr<std::string>& uuid, const std 
        return -1;

    }



#if APPLY_HARD_QUOTAS

    if ((dq.dqb_bhardlimit == 0) || (dq.dqb_ihardlimit == 0)) {

        auto path = create_data_path(uuid ? uuid->c_str() : nullptr);

        struct statvfs stat;
@@ -335,6 +336,10 @@ static int prepare_app_quota(const std::unique_ptr<std::string>& uuid, const std 
        // Hard quota already set; assume it's reasonable

        return 0;

    }

#else

    // Hard quotas disabled

    return 0;

#endif

}



binder::Status InstalldNativeService::createAppData(const std::unique_ptr<std::string>& uuid,

cmds/installd/tests/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ cc_test { 
    cflags: ["-Wall", "-Werror"],

    shared_libs: [

        "libbase",

        "liblog",

        "libutils",

        "libcutils",

    ],

    static_libs: [

        "libinstalld",

        "libdiskusage",

        "libinstalld",

        "liblog",

    ],

}
@@ -25,14 +25,14 @@ cc_test { 
        "libbase",

        "libbinder",

        "libcutils",

        "liblog",

        "liblogwrap",

        "libselinux",

        "libutils",

    ],

    static_libs: [

        "libinstalld",

        "libdiskusage",

        "libinstalld",

        "liblog",

        "liblogwrap",

    ],

}
@@ -45,13 +45,13 @@ cc_test { 
        "libbase",

        "libbinder",

        "libcutils",

        "liblog",

        "liblogwrap",

        "libselinux",

        "libutils",

    ],

    static_libs: [

        "libinstalld",

        "libdiskusage",

        "libinstalld",

        "liblog",

        "liblogwrap",

    ],

}

cmds/installd/tests/installd_cache_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int64_t size(const char* path) { 
static int64_t free() {

    struct statvfs buf;

    if (!statvfs("/data/local/tmp", &buf)) {

        return buf.f_bavail * buf.f_frsize;

        return static_cast<int64_t>(buf.f_bavail) * buf.f_frsize;

    } else {

        PLOG(ERROR) << "Failed to statvfs";

        return -1;

cmds/installd/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ int copy_dir_files(const char *srcname, 
int64_t data_disk_free(const std::string& data_path) {

    struct statvfs sfs;

    if (statvfs(data_path.c_str(), &sfs) == 0) {

        return sfs.f_bavail * sfs.f_frsize;

        return static_cast<int64_t>(sfs.f_bavail) * sfs.f_frsize;

    } else {

        PLOG(ERROR) << "Couldn't statvfs " << data_path;

        return -1;

cmds/installd/utils.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#define BYPASS_QUOTA 0

#define BYPASS_SDCARDFS 0



#define APPLY_HARD_QUOTAS 1



namespace android {

namespace installd {