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

Commit 01314fd7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Disable APPLY_HARD_QUOTAS in favor of "resgid"." into pi-dev am: 93649730 

am: 7aec7ad0

Change-Id: Ie924d7177bf55ce1c2946379680df958de170f50
parents ae9ece96 7aec7ad0

cmds/installd/InstalldNativeService.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -356,8 +356,8 @@ static int prepare_app_dir(const std::string& path, mode_t target_mode, uid_t ui 
 * Ensure that we have a hard-limit quota to protect against abusive apps;

 * Ensure that we have a hard-limit quota to protect against abusive apps;

 * they should never use more than 90% of blocks or 50% of inodes.

 * they should never use more than 90% of blocks or 50% of inodes.

 */

 */

static int prepare_app_quota(const std::unique_ptr<std::string>& uuid, const std::string& device,

static int prepare_app_quota(const std::unique_ptr<std::string>& uuid ATTRIBUTE_UNUSED,

        uid_t uid) {

        const std::string& device, uid_t uid) {

    // Skip when reserved blocks are protecting us against abusive apps

    // Skip when reserved blocks are protecting us against abusive apps

    if (android::base::GetBoolProperty(kPropHasReserved, false)) return 0;

    if (android::base::GetBoolProperty(kPropHasReserved, false)) return 0;

    // Skip when device no quotas present

    // Skip when device no quotas present

cmds/installd/utils.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define BYPASS_QUOTA 0

#define BYPASS_QUOTA 0

#define BYPASS_SDCARDFS 0

#define BYPASS_SDCARDFS 0





#define APPLY_HARD_QUOTAS 1

#define APPLY_HARD_QUOTAS 0





namespace android {

namespace android {

namespace installd {

namespace installd {