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

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

DnsResolver - improve api level detection for aosp am: 701238f5

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

Change-Id: I210d3a4b33ecd6f56a161ff9789dd1e5ddf8519e
parents cd86cf9b 701238f5
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -30,8 +30,11 @@ bool resolv_init(const ResolverNetdCallbacks* callbacks) {
    LOG(INFO) << __func__ << ": Initializing resolver";
    LOG(INFO) << __func__ << ": Initializing resolver";
    resolv_set_log_severity(android::base::WARNING);
    resolv_set_log_severity(android::base::WARNING);


    uint64_t buildVersionSdk = android::base::GetUintProperty<uint64_t>("ro.build.version.sdk", 0);
    uint64_t firstApiLevel =
            android::base::GetUintProperty<uint64_t>("ro.product.first_api_level", 0);
    using android::net::gApiLevel;
    using android::net::gApiLevel;
    gApiLevel = android::base::GetUintProperty<uint64_t>("ro.build.version.sdk", 0);
    gApiLevel = std::max(buildVersionSdk, firstApiLevel);
    using android::net::gResNetdCallbacks;
    using android::net::gResNetdCallbacks;
    gResNetdCallbacks.check_calling_permission = callbacks->check_calling_permission;
    gResNetdCallbacks.check_calling_permission = callbacks->check_calling_permission;
    gResNetdCallbacks.get_network_context = callbacks->get_network_context;
    gResNetdCallbacks.get_network_context = callbacks->get_network_context;