Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AudioService: more communication mode fix

Browse Source 
Do not reset communication mode when an app is not playing or
capturing audio if the app is not the audio mode owner.
In case of dual call situation, a VoIP call can be placed on hold and it
is legit for the app to remain in the mode owner stack but pause
capture and playback.

Bug: 161564483
Test: VoIP call interrupted by Cell call.
Change-Id: Iac5bee9b606e3663b63a4c1c58f9c7a880ab0311
Merged-In: Iac5bee9b606e3663b63a4c1c58f9c7a880ab0311
(cherry picked from commit 54950e8377)
This commit is contained in:
Eric Laurent
2020-09-21 17:56:53 -07:00
parent 29bedbcd95
commit 4dcdfcb089
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -6490,14 +6490,17 @@ public class AudioService extends IAudioService.Stub
if (msg.obj == null) {
break;
}
// If the app corresponding to this mode death handler object is not
// capturing or playing audio anymore after 3 seconds, remove it
// from the stack. Otherwise, check again in 3 seconds.
// If no other app is currently owning the audio mode and
// the app corresponding to this mode death handler object is still in the
// mode owner stack but not capturing or playing audio after 3 seconds,
// remove it from the stack.
// Otherwise, check again in 3 seconds.
SetModeDeathHandler h = (SetModeDeathHandler) msg.obj;
if (mSetModeDeathHandlers.indexOf(h) < 0) {
break;
}
if (mRecordMonitor.isRecordingActiveForUid(h.getUid())
if (getModeOwnerUid() != h.getUid()
|| mRecordMonitor.isRecordingActiveForUid(h.getUid())
|| mPlaybackMonitor.isPlaybackActiveForUid(h.getUid())) {
sendMsg(mAudioHandler,
MSG_CHECK_MODE_FOR_UID,