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

Commit 5ae0f7e3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Standardize page property." into main am: 8067bd81 am: ed3d9b40 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236773



Change-Id: I6d2c15193b0c84a35dcf090ef9bc79f56c56d353
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 045fd6f2 ed3d9b40

init/property_service.cpp

+11 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,16 @@ void PropertyLoadBootDefaults() { 
    update_sys_usb_config();

}



void PropertyLoadDerivedDefaults() {

    const char* PAGE_PROP = "ro.boot.hardware.cpu.pagesize";

    if (GetProperty(PAGE_PROP, "").empty()) {

        std::string error;

        if (PropertySetNoSocket(PAGE_PROP, std::to_string(getpagesize()), &error) != PROP_SUCCESS) {

            LOG(ERROR) << "Could not set '" << PAGE_PROP << "' because: " << error;

        }

    }

}



bool LoadPropertyInfoFromFile(const std::string& filename,

                              std::vector<PropertyInfoEntry>* property_infos) {

    auto file_contents = std::string();
@@ -1421,6 +1431,7 @@ void PropertyInit() { 
    ExportKernelBootProps();



    PropertyLoadBootDefaults();

    PropertyLoadDerivedDefaults();

}



static void HandleInitSocket() {