Bug 1018928 - Fix getUserMedia device selection on Android. r=blassey

This commit is contained in:
Gian-Carlo Pascutto 2014-06-24 10:22:50 +02:00
Родитель e390b7e97c
Коммит 92f57710e7
1 изменённых файлов: 3 добавлений и 2 удалений

Просмотреть файл

@ -107,8 +107,8 @@ var WebrtcUI = {
allowedDevices.AppendElement(audioDevices[audioId]);
let videoId = 0;
if (inputs && inputs.videoDevice != undefined)
videoId = inputs.videoDevice;
if (inputs && inputs.videoSource != undefined)
videoId = inputs.videoSource;
if (videoDevices[videoId])
allowedDevices.AppendElement(videoDevices[videoId]);
@ -198,6 +198,7 @@ var WebrtcUI = {
// Only show the No Video option if there are also Audio devices to choose from
if (audioDevices.length > 0)
extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoSource.none") ];
// videoSource is both the string used for l10n lookup and the object that will be returned
this._addDevicesToOptions(videoDevices, "videoSource", options, extraItems);
}