Merge "Disable APPLY_HARD_QUOTAS in favor of "resgid"." into pi-dev
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 833ffbf..860a68b 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -356,8 +356,8 @@
* 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.
*/
-static int prepare_app_quota(const std::unique_ptr<std::string>& uuid, const std::string& device,
- uid_t uid) {
+static int prepare_app_quota(const std::unique_ptr<std::string>& uuid ATTRIBUTE_UNUSED,
+ const std::string& device, uid_t uid) {
// Skip when reserved blocks are protecting us against abusive apps
if (android::base::GetBoolProperty(kPropHasReserved, false)) return 0;
// Skip when device no quotas present
diff --git a/cmds/installd/utils.h b/cmds/installd/utils.h
index b74073c..5829c4f 100644
--- a/cmds/installd/utils.h
+++ b/cmds/installd/utils.h
@@ -36,7 +36,7 @@
#define BYPASS_QUOTA 0
#define BYPASS_SDCARDFS 0
-#define APPLY_HARD_QUOTAS 1
+#define APPLY_HARD_QUOTAS 0
namespace android {
namespace installd {