Bug 1734748 - Mimic the non-Android path wrt manual invalidation. r=padenot

glandium · glandium · commit df7a2c5f1b1f · 2021-10-13T02:18:44.000Z
Differential Revision: https://phabricator.services.mozilla.com/D127905
diff --git a/dom/media/webrtc/CubebDeviceEnumerator.cpp b/dom/media/webrtc/CubebDeviceEnumerator.cpp
@@ -256,7 +256,8 @@ void CubebDeviceEnumerator::EnumerateAudioDevices(
     name = u"Default audio output device"_ns;
   }
 
-  if (devices.IsEmpty()) {
+  if (devices.IsEmpty() || manualInvalidation) {
+    devices.Clear();
     // Bug 1473346: enumerating devices is not supported on Android in cubeb,
     // simply state that there is a single sink, that it is the default, and has
     // a single channel. All the other values are made up and are not to be

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,8 @@ void CubebDeviceEnumerator::EnumerateAudioDevices(`
`256`	`256`	`name = u"Default audio output device"_ns;`
`257`	`257`	`}`
`258`	`258`
`259`		`- if (devices.IsEmpty()) {`
	`259`	`+ if (devices.IsEmpty() \|\| manualInvalidation) {`
	`260`	`+ devices.Clear();`
`260`	`261`	`// Bug 1473346: enumerating devices is not supported on Android in cubeb,`
`261`	`262`	`// simply state that there is a single sink, that it is the default, and has`
`262`	`263`	`// a single channel. All the other values are made up and are not to be`