diff options
| author | Roshan Pius <rpius@google.com> | 2022-04-11 13:51:21 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2022-04-11 14:13:16 -0700 |
| commit | ef614df64253ed35a701ac431b37400e9c0a9e88 (patch) | |
| tree | f192e63b6ad1ebbca4005b8fa25dd475c06b1c38 | |
| parent | bc0f0959ceec3a13db1c5b8bbcbe1e5d426403dc (diff) | |
| download | Uwb-ef614df64253ed35a701ac431b37400e9c0a9e88.tar.gz | |
uwb(jni): Don't use android_logger
Bug: 216784920
Test: Manual verification of logs
Change-Id: Icc7837e0203997cd18eb1c99e9dbb0fa7b238b09
| -rwxr-xr-x | service/uci/jni/Android.bp | 3 | ||||
| -rw-r--r-- | service/uci/jni/rust/lib.rs | 15 |
2 files changed, 6 insertions, 12 deletions
diff --git a/service/uci/jni/Android.bp b/service/uci/jni/Android.bp index c99a25a3..d6a27b03 100755 --- a/service/uci/jni/Android.bp +++ b/service/uci/jni/Android.bp @@ -10,10 +10,9 @@ rust_defaults { min_sdk_version: "Tiramisu", srcs: ["rust/lib.rs"], rustlibs: [ - "libandroid_logger", "libjni", - "liblog_rust", "libbinder_rs", + "liblog_rust", "liblogger", "libnum_traits", "libuwb_uci_packets", diff --git a/service/uci/jni/rust/lib.rs b/service/uci/jni/rust/lib.rs index 780aa057..3b67e51d 100644 --- a/service/uci/jni/rust/lib.rs +++ b/service/uci/jni/rust/lib.rs @@ -1,12 +1,11 @@ //! jni for uwb native stack -use android_logger::FilterBuilder; use jni::objects::{JObject, JValue}; use jni::sys::{ jarray, jboolean, jbyte, jbyteArray, jint, jintArray, jlong, jobject, jshort, jshortArray, jsize, }; use jni::JNIEnv; -use log::{error, info, LevelFilter}; +use log::{error, info}; use num_traits::ToPrimitive; use uwb_uci_packets::{ GetCapsInfoRspPacket, Packet, SessionGetAppConfigRspPacket, SessionSetAppConfigRspPacket, @@ -90,15 +89,11 @@ pub extern "system" fn Java_com_android_server_uwb_jni_NativeUwbManager_nativeIn _env: JNIEnv, _obj: JObject, ) -> jboolean { - let crates_log_lvl_filter = FilterBuilder::new() - .filter(None, LevelFilter::Trace) // default log level - .filter(Some("jni"), LevelFilter::Info) // reduced log level for jni crate - .build(); - android_logger::init_once( - android_logger::Config::default() - .with_tag("uwb") + logger::init( + logger::Config::default() + .with_tag_on_device("uwb") .with_min_level(log::Level::Trace) - .with_filter(crates_log_lvl_filter), + .with_filter("trace,jni=info"), ); info!("Java_com_android_server_uwb_jni_NativeUwbManager_nativeInit: enter"); true as jboolean |