commit 1df77b62b5f5da43cba5ba951cc77f1aada3240a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 11 19:46:06 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 11 19:46:06 2023 +0000
tree 6223eec5a148a79e2cc5c4214179c078401372bb
parent 5ea3a6d1404b13c83ee6dfa5919e5bcc1962b3ba
parent 96daffcecde377190724aa3041efb39a42908c77

Merge "Only returns supported mixer attributes for USB output devices." into udc-dev

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index ab1a050..f093e68 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4373,6 +4373,11 @@
         ALOGE("%s the requested device is currently unavailable", __func__);
         return BAD_VALUE;
     }
+    if (!audio_is_usb_out_device(deviceDescriptor->type())) {
+        ALOGE("%s the requested device(type=%#x) is not usb device", __func__,
+              deviceDescriptor->type());
+        return BAD_VALUE;
+    }
     for (const auto& hwModule : mHwModules) {
         for (const auto& curProfile : hwModule->getOutputProfiles()) {
             if (curProfile->supportsDevice(deviceDescriptor)) {