Commit 062e5084 authored Aug 07, 2023 by howardchung

Floss: Don't unwrap on the parse result of admin policy

For some unknown reason, the json file storing the admin policies could
be malformed, which causes rust panic when unwraping on the result.

This removes the unwrap to prevent the crash, instead, a warning message
will be printed.

Bug: 294498944
Test: modify /var/lib/bluetooth/admin_policy.json to 'abcd' and restart
btadapterd. verify there is no crash.
Test: mma -j32

Change-Id: Iea7c7d4eb4da5f27949a23d7909f1bded832621b

parent 64a7f09f

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);
		}