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

Skip to content
Commit fa02e531 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Fix concurrency issues with ringtone playback.

CallAudioManager has a number of calls into Ringer.java; this code can
come from CallAudioModeStateMachine which is in turn called into via
Bluetooth callbacks.  Added synchronization using the Telecom lock on these
calls to ensure ringer operations don't have concurrency issues.

Also, in AsyncRingtonePlayer add some null checks to ensure that it is
not possible to run into the NPE reported in the bug, should concurrency
issues persist.

Test: Ran unit tests to confirm no regressions in behavior.
Test: Manual test with bluetooth headset; verify I'm seeing the session
logging for ringtone playing now.
Bug: 135997076

Change-Id: I9a119b15d2853a44d5850d040bd31340d1e34127
Merged-In: I9a119b15d2853a44d5850d040bd31340d1e34127
(cherry picked from commit bbe5d150)
parent fbe011ee
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment