commit 794d696282682b603a5ed07a6c047fe1dbc483f1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:46:49 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:46:49 2022 +0000
tree c1fdd4e6db06429e7a726e1453292e3179f810ef
parent e9566d2e1293c6cfaa6205f01767204c67dc21af
parent 43bde0116bb22fa68f3a14a18eef9dc332045f4f

Snap for 8730993 from 43bde0116bb22fa68f3a14a18eef9dc332045f4f to mainline-tzdata3-release

Change-Id: I317daeb5063b825c68b46942f0e8a15485341eb8

Android.bp

diff --git a/Android.bp b/Android.bp
index 045924c..bbcb86d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,10 +40,9 @@
         darwin: {
             enabled: false,
         },
-        bionic: {
-            system_shared_libs: ["libc", "libdl"],
-        },
     },
+
+    system_shared_libs: ["libc","libdl"],
 }
 
 cc_binary {

OWNERS

diff --git a/OWNERS b/OWNERS
index ccb311a..e1e3676 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,2 @@
 dvdli@google.com
-elaurent@google.com
-mnaganov@google.com
-carterhsu@google.com
-
+gkasten@google.com

mixer.c

diff --git a/mixer.c b/mixer.c
index fd0ad8d..7b8540a 100644
--- a/mixer.c
+++ b/mixer.c
@@ -619,9 +619,6 @@
         }
 
     case SNDRV_CTL_ELEM_TYPE_IEC958:
-        ret = grp->ops->ioctl(grp->data, SNDRV_CTL_IOCTL_ELEM_READ, &ev);
-        if (ret < 0)
-            return ret;
         size = sizeof(ev.value.iec958);
         source = &ev.value.iec958;
         break;

tinyhostless.c

diff --git a/tinyhostless.c b/tinyhostless.c
index 50c26fc..2f5e5f9 100644
--- a/tinyhostless.c
+++ b/tinyhostless.c
@@ -73,7 +73,7 @@
     if (argc < 2) {
         fprintf(stderr, "Usage: %s [-D card] [-P playback device]"
             " [-C capture device] [-p period_size] [-n n_periods]"
-            " [-c num_channels] [-b number_bits] [-r sample_rate] [-l]"
+            " [-c num_channels] [-r sample_rate] [-l]"
             " [-T playback/capture time]\n\n"
             "Used to enable 'hostless' mode for audio devices with a DSP back-end.\n"
             "Alternatively, specify '-l' for loopback mode: this program will read\n"
@@ -110,11 +110,6 @@
             if (*argv)
                 num_channels = atoi(*argv);
         }
-        if (strcmp(*argv, "-b") == 0) {
-            argv++;
-            if (*argv)
-                number_bits = atoi(*argv);
-        }
         if (strcmp(*argv, "-r") == 0) {
             argv++;
             if (*argv)
@@ -209,7 +204,7 @@
 
     can_play = check_param(params, PCM_PARAM_RATE, config->rate, "Sample rate", "Hz");
     can_play &= check_param(params, PCM_PARAM_CHANNELS, config->channels, "Sample", " channels");
-    can_play &= check_param(params, PCM_PARAM_SAMPLE_BITS, bits, "Bitwidth", " bits");
+    can_play &= check_param(params, PCM_PARAM_SAMPLE_BITS, bits, "Bitrate", " bits");
     can_play &= check_param(params, PCM_PARAM_PERIOD_SIZE, config->period_size, "Period size", " frames");
     can_play &= check_param(params, PCM_PARAM_PERIODS, config->period_count, "Period count", " periods");
 

tinyplay.c

diff --git a/tinyplay.c b/tinyplay.c
index 8928d92..0354df6 100644
--- a/tinyplay.c
+++ b/tinyplay.c
@@ -201,7 +201,7 @@
 
     can_play = check_param(params, PCM_PARAM_RATE, rate, "Sample rate", "Hz");
     can_play &= check_param(params, PCM_PARAM_CHANNELS, channels, "Sample", " channels");
-    can_play &= check_param(params, PCM_PARAM_SAMPLE_BITS, bits, "Bitwidth", " bits");
+    can_play &= check_param(params, PCM_PARAM_SAMPLE_BITS, bits, "Bitrate", " bits");
     can_play &= check_param(params, PCM_PARAM_PERIOD_SIZE, period_size, "Period size", " frames");
     can_play &= check_param(params, PCM_PARAM_PERIODS, period_count, "Period count", " periods");