Merge tag 'android-14.0.0_r50' of https://android.googlesource.com/platform/packages/modules/DnsResolver into u14.0HEADu14.0

Android 14.0.0 Release 50 (AP2A.240605.024)

3 files changed, 9 insertions, 8 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/Android.bp b/doh/tests/doh_frontend/Android.bp
index e4db22ef..156fb5cc 100644
--- a/doh/tests/doh_frontend/Android.bp
+++ b/doh/tests/doh_frontend/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "packages_modules_DnsResolver_license"
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),
     );
 }