Merge "audio policy: fix input preferred device logic" into main
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioIODescriptorInterface.h b/services/audiopolicy/common/managerdefinitions/include/AudioIODescriptorInterface.h
index e519766..918e247 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioIODescriptorInterface.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioIODescriptorInterface.h
@@ -64,6 +64,21 @@
if (activeClients.size() == activeClientsWithRoute.size()) {
return devices.getDeviceFromId(activeClientsWithRoute[0]->preferredDeviceId());
}
+ if (activeClientsWithRoute.size() == 0) {
+ return nullptr;
+ }
+ uid_t uniqueUid = activeClients[0]->uid();
+ for (const auto &client : activeClients) {
+ if (uniqueUid != client->uid()) {
+ return nullptr;
+ }
+ }
+ for (const auto &client : activeClientsWithRoute) {
+ if (uniqueUid != client->uid()) {
+ return nullptr;
+ }
+ }
+ return devices.getDeviceFromId(activeClientsWithRoute[0]->preferredDeviceId());
}
}
return nullptr;
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index a52ec64..be740a6 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -7839,7 +7839,8 @@
}
// Honor explicit routing requests only if no client using default routing is active on this
- // input: a specific app can not force routing for other apps by setting a preferred device.
+ // input or if all active clients are from the same app: a specific app can not force routing
+ // for other apps by setting a preferred device.
bool active;
device = findPreferredDevice(inputDesc, AUDIO_SOURCE_DEFAULT, active, mAvailableInputDevices);
if (device != nullptr) {