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

Commit 7601e970 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

DnsResolver - improve aosp api level detection am: ebe06e8b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1366616

Change-Id: Iea6a7829bd7aa0a946818bf07f272e2470f33809
parents 7be4d3be ebe06e8b

DnsResolver.cpp

+3 −1
Original line number Diff line number Diff line
@@ -31,10 +31,12 @@ bool resolv_init(const ResolverNetdCallbacks* callbacks) { 
    resolv_set_log_severity(android::base::WARNING);



    uint64_t buildVersionSdk = android::base::GetUintProperty<uint64_t>("ro.build.version.sdk", 0);

    uint64_t buildVersionPreviewSdk =

            android::base::GetUintProperty<uint64_t>("ro.build.version.preview_sdk", 0);

    uint64_t firstApiLevel =

            android::base::GetUintProperty<uint64_t>("ro.product.first_api_level", 0);

    using android::net::gApiLevel;

    gApiLevel = std::max(buildVersionSdk, firstApiLevel);

    gApiLevel = std::max(buildVersionSdk + !!buildVersionPreviewSdk, firstApiLevel);

    using android::net::gResNetdCallbacks;

    gResNetdCallbacks.check_calling_permission = callbacks->check_calling_permission;

    gResNetdCallbacks.get_network_context = callbacks->get_network_context;