Snap for 11381838 from 296a5fd1586ec1a2a4653651ea0dc3def7a8b15f to mainline-adservices-releaseaml_ads_341615050

Change-Id: I96ae131792792b7205776b92e4a5ef637578a8e6

3 files changed, 8 insertions, 9 deletions

diff --git a/doh/ffi.rs b/doh/ffi.rs
index 63b98cc8..e183a620 100644
--- a/doh/ffi.rs
+++ b/doh/ffi.rs
@@ -122,8 +122,8 @@ pub const DOH_LOG_LEVEL_TRACE: u32 = 4;
 
 const DOH_PORT: u16 = 443;
 
-fn level_from_u32(level: u32) -> Option<log::Level> {
-    use log::Level::*;
+fn level_from_u32(level: u32) -> Option<log::LevelFilter> {
+    use log::LevelFilter::*;
     match level {
         DOH_LOG_LEVEL_ERROR => Some(Error),
         DOH_LOG_LEVEL_WARN => Some(Warn),
@@ -139,17 +139,15 @@ fn level_from_u32(level: u32) -> Option<log::Level> {
 /// If called more than once, it will have no effect on subsequent calls.
 #[no_mangle]
 pub extern "C" fn doh_init_logger(level: u32) {
-    let log_level = level_from_u32(level).unwrap_or(log::Level::Error);
-    android_logger::init_once(android_logger::Config::default().with_min_level(log_level));
+    let log_level = level_from_u32(level).unwrap_or(log::LevelFilter::Error);
+    android_logger::init_once(android_logger::Config::default().with_max_level(log_level));
 }
 
 /// Set the log level.
 /// If an invalid level is passed, defaults to logging errors only.
 #[no_mangle]
 pub extern "C" fn doh_set_log_level(level: u32) {
-    let level_filter = level_from_u32(level)
-        .map(|level| level.to_level_filter())
-        .unwrap_or(log::LevelFilter::Error);
+    let level_filter = level_from_u32(level).unwrap_or(log::LevelFilter::Error);
     log::set_max_level(level_filter);
 }
 
diff --git a/doh/tests/doh_frontend/src/ffi.rs b/doh/tests/doh_frontend/src/ffi.rs
index 37a5fba0..f4960fe4 100644
--- a/doh/tests/doh_frontend/src/ffi.rs
+++ b/doh/tests/doh_frontend/src/ffi.rs
@@ -198,7 +198,9 @@ pub extern "C" fn frontend_stats_clear_queries(doh: &DohFrontend) -> bool {
 #[no_mangle]
 pub extern "C" fn init_android_logger() {
     android_logger::init_once(
-        android_logger::Config::default().with_tag("DohFrontend").with_min_level(log::Level::Debug),
+        android_logger::Config::default()
+            .with_tag("DohFrontend")
+            .with_max_level(log::LevelFilter::Debug),
     );
 }
 
diff --git a/sethostent.cpp b/sethostent.cpp
index 55b8c8bc..1bd8ab4c 100644
--- a/sethostent.cpp
+++ b/sethostent.cpp
@@ -132,7 +132,6 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) {
             if ((size_t)(ptr - buf) >= info->buflen) goto nospc;
         }
 
-        if (num >= MAXADDRS) goto nospc;
         if (hp->h_addr_list[0] == nullptr) {
             free(buf);
             endhostent_r(&hf);