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

Commit 75106377 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8055626 from d921c475 to tm-d1-release 

Change-Id: I975915aa504c61fe82308d1da7662ddfb71405de
parents 6e38ca74 d921c475

doh/ffi.rs

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ use std::os::unix::io::RawFd; 
use std::str::FromStr;

use std::str::FromStr;

use std::sync::{Arc, Mutex};

use std::sync::{Arc, Mutex};

use std::{ptr, slice};

use std::{ptr, slice};

use tokio::runtime::Runtime;

use tokio::runtime::Builder;

use tokio::sync::oneshot;

use tokio::sync::oneshot;

use tokio::task;

use tokio::task;

use url::Url;

use url::Url;
@@ -275,7 +275,7 @@ pub unsafe extern "C" fn doh_query( 
        return DOH_RESULT_CAN_NOT_SEND;

        return DOH_RESULT_CAN_NOT_SEND;

    }

    }





    if let Ok(rt) = Runtime::new() {

    if let Ok(rt) = Builder::new_current_thread().enable_all().build() {

        let local = task::LocalSet::new();

        let local = task::LocalSet::new();

        match local.block_on(&rt, async { timeout(t, resp_rx).await }) {

        match local.block_on(&rt, async { timeout(t, resp_rx).await }) {

            Ok(v) => match v {

            Ok(v) => match v {