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

Commit 746c5b9b authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Floss: Don't unwrap on the parse result of admin policy" into main am: 6ca88599 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2696814



Change-Id: Ideed50a506afbf452a5391bca60d2ff253fd90f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcd04c0e 6ca88599

system/gd/rust/linux/stack/src/bluetooth_admin.rs

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ impl BluetoothAdmin { 
        let mut file = File::open(&self.path)?;

        let mut contents = String::new();

        file.read_to_string(&mut contents)?;

        let json = serde_json::from_str::<Value>(contents.as_str()).unwrap();

        let json = serde_json::from_str::<Value>(contents.as_str())?;

        if let Some(_res) = self.load_config_from_json(&json) {

            info!("Load settings from {} successfully", &self.path);

        }