commit fc8da8e82c4a242f52f361edcc1941d61fb357b7
author Howard Chung <howardchung@google.com> Fri Sep 08 14:33:07 2023 +0800
committer Yun-Hao Chung <howardchung@google.com> Fri Sep 08 12:03:42 2023 +0000
tree c84c7e5c91979d80cf30decd13043a2a4bbad15a
parent 5da20d0263ad6792539809983742b31ada23fc4b

Floss: Don't discard suspend_id on suspend timeout

When the bluetooth suspend process is timeout, we still continue the
suspend but set the suspend_id to None. This makes resume unable to know
the suspend_id and actually cause crashes in unwrap.

This CL removes the line to set suspend_id to None on timeout.

Bug: 298805909
Test: mma -j32
Test: run bluetooth_AdapterSRHealth on brya
Tag: #floss
Change-Id: Id841bfe07969f422420522ce12ccf15da899cf80

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

diff --git a/system/gd/rust/linux/stack/src/suspend.rs b/system/gd/rust/linux/stack/src/suspend.rs
index 7c54d6a..3cfd9b2 100644
--- a/system/gd/rust/linux/stack/src/suspend.rs
+++ b/system/gd/rust/linux/stack/src/suspend.rs
@@ -310,7 +310,6 @@
 
             suspend_state.lock().unwrap().le_rand_expected = false;
             suspend_state.lock().unwrap().suspend_expected = false;
-            suspend_state.lock().unwrap().suspend_id = None;
             tokio::spawn(async move {
                 let _result = tx.send(Message::SuspendReady(suspend_id)).await;
             });