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

Commit 097b46e4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Skip initializing ro.vendor.api_level if already defined" into main am: 6c6b9e33 

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



Change-Id: I91f60d742914d046c71acfeaa9a9c1a0d6682971
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce2e4b52 6c6b9e33

init/property_service.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,12 @@ static void property_initialize_ro_vendor_api_level() { 
    // required to support.

    constexpr auto VENDOR_API_LEVEL_PROP = "ro.vendor.api_level";



    if (__system_property_find(VENDOR_API_LEVEL_PROP) != nullptr) {

        // The device already have ro.vendor.api_level in its vendor/build.prop.

        // Skip initializing the ro.vendor.api_level property.

        return;

    }



    auto vendor_api_level = GetIntProperty("ro.board.first_api_level", __ANDROID_VENDOR_API_MAX__);

    if (vendor_api_level != __ANDROID_VENDOR_API_MAX__) {

        // Update the vendor_api_level with "ro.board.api_level" only if both "ro.board.api_level"