From 7cf50e68fdeeda5ac48d1894ca17f4ad94f6e571 Mon Sep 17 00:00:00 2001
From: Vachounet <vachounet@live.fr>
Date: Wed, 17 May 2017 08:04:29 +0200
Subject: [PATCH] Revert "potter: init: set dalvik heap props based on detected
 RAM size"

(reverted from commit 5bdfbe45504e2cd65a298d9d70b2bb67283fe4b8)

Change-Id: I5f896c1f5aa8c142569ca4bbf214cf6a85f28e43
---
 init/init_potter.cpp | 25 -------------------------
 system.prop          |  5 +++++
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/init/init_potter.cpp b/init/init_potter.cpp
index 737da11..1544fec 100644
--- a/init/init_potter.cpp
+++ b/init/init_potter.cpp
@@ -27,9 +27,7 @@
    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <fcntl.h>
 #include <stdlib.h>
-#include <sys/sysinfo.h>
 
 #include "vendor_init.h"
 #include "property_service.h"
@@ -51,7 +49,6 @@ void num_sims() {
 
 void vendor_load_properties()
 {
-    struct sysinfo sys;
     std::string platform = property_get("ro.board.platform");
 
     if (platform != ANDROID_TARGET)
@@ -81,27 +78,5 @@ void vendor_load_properties()
     if (sku == "XT1683") {
         property_set("ro.hw.dtv", "true");
     }
-
-    sysinfo(&sys);
-
-    if (sys.totalram > 3072ull * 1024 * 1024) {
-        property_set("dalvik.vm.heapstartsize", "8m");
-        property_set("dalvik.vm.heapgrowthlimit", "384m");
-        property_set("dalvik.vm.heapsize", "1024m");
-        property_set("dalvik.vm.heapminfree", "4m");
-        property_set("dalvik.vm.heapmaxfree", "16m");
-    } else if (sys.totalram > 2048ull * 1024 * 1024) {
-        property_set("dalvik.vm.heapstartsize", "8m");
-        property_set("dalvik.vm.heapgrowthlimit", "288m");
-        property_set("dalvik.vm.heapsize", "768m");
-        property_set("dalvik.vm.heapminfree", "512k");
-        property_set("dalvik.vm.heapmaxfree", "8m");
-    } else {
-        property_set("dalvik.vm.heapstartsize", "16m");
-        property_set("dalvik.vm.heapgrowthlimit", "192m");
-        property_set("dalvik.vm.heapsize", "512m");
-        property_set("dalvik.vm.heapminfree", "2m");
-        property_set("dalvik.vm.heapmaxfree", "8m");
-   }
 }
 
diff --git a/system.prop b/system.prop
index 3572b0c..6a11716 100644
--- a/system.prop
+++ b/system.prop
@@ -77,6 +77,11 @@ ro.core_ctl_max_cpu=4
 ro.core_ctl_min_cpu=2
 
 # Dalvik
+dalvik.vm.heapgrowthlimit=192m
+dalvik.vm.heapmaxfree=8m
+dalvik.vm.heapminfree=512k
+dalvik.vm.heapsize=384m
+dalvik.vm.heapstartsize=8m
 dalvik.vm.heaptargetutilization=0.75
 
 # Display