wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1226483 - Add ASSERT check to AudioManager::SelectDeviceFromDevices() r=alwu

Browse Source
This commit is contained in:
Sotaro Ikeda 2015-11-20 03:19:28 -08:00
parent e01ea2d3bb
commit 0cf34a3925
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/system/gonk/AudioManager.cpp
View File

@ -1286,6 +1286,9 @@ AudioManager::SelectDeviceFromDevices(uint32_t aOutDevices)
device &= AUDIO_DEVICE_OUT_ALL_A2DP;
}
}
#if ANDROID_VERSION >= 17
MOZ_ASSERT(audio_is_output_device(device));
#endif
return device;
}
AudioManager::VolumeStreamState::VolumeStreamState(AudioManager& aManager,

11
dom/system/gonk/android_audio/AudioSystem.h
View File

@ -547,6 +547,17 @@ enum {
typedef uint32_t audio_devices_t;
#endif
#if ANDROID_VERSION >= 17
static inline bool audio_is_output_device(audio_devices_t device)
{
if (((device & AUDIO_DEVICE_BIT_IN) == 0) &&
(__builtin_popcount(device) == 1) && ((device & ~AUDIO_DEVICE_OUT_ALL) == 0))
return true;
else
return false;
}
#endif
/* device connection states used for audio_policy->set_device_connection_state()
* */
typedef enum {