Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1092346 - At the end of a call the proper volume control channel is not restored in the dialer app. r=baku.

Browse Source
This commit is contained in:
Alastor Wu 2015-02-04 10:10:22 +08:00
parent 867a659f65
commit 795ea84f41
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/audiochannel/AudioChannelService.cpp
View File

@ -525,7 +525,9 @@ AudioChannelService::SetDefaultVolumeControlChannelInternal(int32_t aChannel,
// If this child is in the background and mDefChannelChildID is set to
// others then it means other child in the foreground already set it's
// own default channel already.
if (!aHidden && mDefChannelChildID != aChildID) {
if ((!aHidden && mDefChannelChildID != aChildID) ||
(mDefChannelChildID != aChildID &&
mDefChannelChildID != CONTENT_PROCESS_ID_UNKNOWN)) {
return;
}
@ -839,7 +841,7 @@ AudioChannelService::Observe(nsISupports* aSubject, const char* aTopic, const ch
if (!setting.mValue.isNumber()) {
return NS_OK;
}
nsCOMPtr<nsIAudioManager> audioManager = do_GetService(NS_AUDIOMANAGER_CONTRACTID);
NS_ENSURE_TRUE(audioManager, NS_OK);