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

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

Snap for 8077152 from 56492f1e to mainline-mediaprovider-release 

Change-Id: Ic51ae2f771f27e56e2510b6ccc2d3d3e40ff1eff
parents e68d13be 56492f1e

ResolverController.cpp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int getDnsInfo(unsigned netId, std::vector<std::string>* servers, std::vector<st 
        return 0;

    }



    // Verify that the returned data is sane.

    // Verify that the returned data is valid.

    if (nscount < 0 || nscount > MAXNS || dcount < 0 || dcount > MAXDNSRCH) {

        LOG(ERROR) << __func__ << ": nscount = " << nscount << ", dcount = " << dcount;

        return -ENOTRECOVERABLE;

doh/dispatcher/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ pub struct Dispatcher { 
}



impl Dispatcher {

    const DOH_THREADS: usize = 2;

    const DOH_THREADS: usize = 1;



    pub fn new(validation: ValidationReporter, tagger: SocketTagger) -> Result<Dispatcher> {

        let (cmd_sender, cmd_receiver) = mpsc::channel::<Command>(MAX_BUFFERED_CMD_COUNT);

doh/ffi.rs

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

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

use std::{ptr, slice};

use tokio::runtime::Runtime;

use tokio::runtime::Builder;

use tokio::sync::oneshot;

use tokio::task;

use url::Url;
@@ -275,7 +275,7 @@ pub unsafe extern "C" fn doh_query( 
        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();

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

            Ok(v) => match v {