commit c0a81b9dc69af81dff4b2c4b338c1a477c1d412d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon May 22 18:28:54 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 22 18:28:54 2023 +0000
tree cf0084c9a15d41d31b0ebb49dc9033ab6b305c43
parent 0763f1b9680b22c5911a16e836c8f9135fa33715
parent abf24d3cc770f04b7ece1986fd51ce5db742a811

Merge "Use requested sample rate when it matches device sample rate."

Android.bp

diff --git a/Android.bp b/Android.bp
index 88e0d44..6baab68 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,7 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.btservices",
+        "com.android.media",
         "com.android.media.swcodec",
     ],
     min_sdk_version: "29",

modules/usbaudio/audio_hal.c

diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c
index f21dcd7..57f523b 100644
--- a/modules/usbaudio/audio_hal.c
+++ b/modules/usbaudio/audio_hal.c
@@ -809,6 +809,8 @@
             ALOGE("%s failed to open device(card: %d device: %d)",
                     __func__, device_info->profile.card, device_info->profile.device);
             goto exit;
+        } else {
+            out->standby = false;
         }
     }
 
@@ -835,7 +837,6 @@
         if (ret != 0) {
             goto err;
         }
-        out->standby = false;
     }
 
     struct listnode* node;
@@ -1262,7 +1263,7 @@
     return 0;
 }
 
-/* must be called with hw device and output stream mutexes locked */
+/* must be called with hw device and input stream mutexes locked */
 static int start_input_stream(struct stream_in *in)
 {
     // Only care about the first device as only one input device is allowed.
@@ -1273,7 +1274,11 @@
 
     ALOGV("start_input_stream(card:%d device:%d)",
             device_info->profile.card, device_info->profile.device);
-    return proxy_open(&device_info->proxy);
+    int ret = proxy_open(&device_info->proxy);
+    if (ret == 0) {
+        in->standby = false;
+    }
+    return ret;
 }
 
 /* TODO mutex stuff here (see out_write) */
@@ -1292,7 +1297,6 @@
         if (ret != 0) {
             goto err;
         }
-        in->standby = false;
     }
 
     // Only care about the first device as only one input device is allowed.
@@ -1857,10 +1861,10 @@
     if (!wasStandby) {
         device_lock(adev);
         if (in != NULL) {
-            start_input_stream(in);
+            ret = start_input_stream(in);
         }
         if (out != NULL) {
-            start_output_stream(out);
+            ret = start_output_stream(out);
         }
         device_unlock(adev);
     }