From 2c85ec0e3326d602d1575986ab9209bcc8d61c44 Mon Sep 17 00:00:00 2001
From: Lokesh Gidra <lokeshgidra@google.com>
Date: Fri, 6 Dec 2019 14:00:16 -0800
Subject: [PATCH] sm7250-common: Use 6GB dalvik-heap config

We are currently using 2GB dalvik-heap config.

Bug: 145823510
Test: MPTS
Change-Id: I086d4a5c09634c3c7bd51ec5d08dcaa1551511b4
---
 common.mk   | 3 +++
 vendor.prop | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/common.mk b/common.mk
index 4a0e6bb..c088294 100644
--- a/common.mk
+++ b/common.mk
@@ -20,6 +20,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 # Include GSI keys
 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)
 
+# Setup dalvik vm configs
+$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
+
 # Get non-open-source specific aspects
 $(call inherit-product, vendor/oneplus/sm7250-common/sm7250-common-vendor.mk)
 
diff --git a/vendor.prop b/vendor.prop
index 39ffa88..f904c0f 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -121,14 +121,6 @@ vendor.camera.aux.packagelist=com.oem.autotest,com.oneplus.factorymode,com.onepl
 ro.crypto.allow_encrypt_override=true
 ro.crypto.volume.filenames_mode=aes-256-cts
 
-# Dalvik
-dalvik.vm.heapgrowthlimit=256m
-dalvik.vm.heapmaxfree=8m
-dalvik.vm.heapminfree=512k
-dalvik.vm.heapsize=512m
-dalvik.vm.heapstartsize=8m
-dalvik.vm.heaptargetutilization=0.75
-
 # Display
 ro.vendor.display.sensortype=2
 vendor.display.comp_mask=0