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

Commit b1f21625 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "16k kernel dev option changes ro.build.fingerprint" into main am: bf7e0df4 

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



Change-Id: Ia837f5efa1e89cd484db8940b88eabcca8780ecf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6654e8f2 bf7e0df4

init/property_service.cpp

+11 −0
Original line number Diff line number Diff line
@@ -974,6 +974,17 @@ static std::string ConstructBuildFingerprint(bool legacy) { 
    std::string build_fingerprint = GetProperty("ro.product.brand", UNKNOWN);

    build_fingerprint += '/';

    build_fingerprint += GetProperty("ro.product.name", UNKNOWN);



    // should be set in /product/etc/build.prop

    // when we have a dev option device, and we've switched the kernel to 16kb mode

    // we use the same system image, but we've switched out the kernel, so make it

    // visible at a high level

    bool has16KbDevOption =

            android::base::GetBoolProperty("ro.product.build.16k_page.enabled", false);

    if (has16KbDevOption && getpagesize() == 16384) {

        build_fingerprint += "_16kb";

    }



    build_fingerprint += '/';

    build_fingerprint += GetProperty("ro.product.device", UNKNOWN);

    build_fingerprint += ':';