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

Commit fc8da8e8 authored by Howard Chung's avatar Howard Chung Committed by Yun-Hao Chung
Browse files

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
parent 5da20d02

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

+0 −1
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ impl ISuspend for Suspend { 


            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;

            });