diff options
| -rw-r--r-- | init/Android.mk | 2 | ||||
| -rw-r--r-- | init/init_msm8996.cpp | 52 |
2 files changed, 14 insertions, 40 deletions
diff --git a/init/Android.mk b/init/Android.mk index 987a868..6ee7ecf 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -23,7 +23,5 @@ LOCAL_C_INCLUDES := system/core/init LOCAL_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\" LOCAL_SRC_FILES := init_msm8996.cpp LOCAL_MODULE := libinit_msm8996 -LOCAL_STATIC_LIBRARIES := \ - libbase include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_msm8996.cpp b/init/init_msm8996.cpp index 04f02a7..fd30f51 100644 --- a/init/init_msm8996.cpp +++ b/init/init_msm8996.cpp @@ -32,15 +32,9 @@ #include <stdlib.h> #include <sys/sysinfo.h> #include <cutils/properties.h> -#include <android-base/properties.h> -#include "property_service.h" #include "vendor_init.h" - -using android::base::GetProperty; -using android::base::SetProperty; - -std::string heapminfree; -std::string heapmaxfree; +#include "log.h" +#include "util.h" static void init_alarm_boot_properties() { @@ -66,41 +60,23 @@ static void init_alarm_boot_properties() * 7 -> CBLPWR_N pin toggled (for external power supply) * 8 -> KPDPWR_N pin toggled (power key pressed) */ - SetProperty("ro.alarm_boot", boot_reason == 3 ? "true" : "false"); -} - -void check_ram() -{ - struct sysinfo sys; - - sysinfo(&sys); - - if (sys.totalram > 3072ull * 1024 * 1024) { - // from - phone-xxxhdpi-4096-dalvik-heap.mk - heapminfree = "4m"; - heapmaxfree = "16m"; - } else { - // from - phone-xxhdpi-3072-dalvik-heap.mk - heapminfree = "512k"; - heapmaxfree = "8m"; - } + if (boot_reason == 3) { + property_set("ro.alarm_boot", "true"); + } else { + property_set("ro.alarm_boot", "false"); + } } void vendor_load_properties() { - std::string platform; - - platform = GetProperty("ro.board.platform", ""); - if (platform != ANDROID_TARGET) + char device[PROP_VALUE_MAX]; + char rf_version[PROP_VALUE_MAX]; + int rc; + + rc = property_get("ro.product.device", device, NULL); + if (!rc || strncmp(device, "z2_plus", PROP_VALUE_MAX)) return; - - check_ram(); - SetProperty("dalvik.vm.heapstartsize", "8m"); - SetProperty("dalvik.vm.heapgrowthlimit", "256m"); - SetProperty("dalvik.vm.heapsize", "512m"); - SetProperty("dalvik.vm.heaptargetutilization", "0.75"); - SetProperty("dalvik.vm.heapminfree", heapminfree); - SetProperty("dalvik.vm.heapmaxfree", heapmaxfree); + property_set("ro.product.model", "Z2 Plus"); init_alarm_boot_properties(); } |