commit f152fc48da555f2f470622cdd5c305bd870a9f23
author Treehugger Robot <treehugger-gerrit@google.com> Sat Dec 10 03:17:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 10 03:17:14 2022 +0000
tree a69dcc4ff7edef2cb8cbb3437b95fbb703058f90
parent bda7bc0fdeb846b59974d380c1edf329c1f7bfd7
parent caeb590d0af0828f3b3825533bce5b205bccea65

Merge "Fix sizeof warnings on unusual calloc" am: 4ca44e7615 am: 3f31ee2d2a am: caeb590d0a

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2337324

Change-Id: Ia70ae54c520d0883a23f237c7fbbe02b0f32a136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

modules/sensors/dynamic_sensor/HidRawDevice.cpp

diff --git a/modules/sensors/dynamic_sensor/HidRawDevice.cpp b/modules/sensors/dynamic_sensor/HidRawDevice.cpp
index 2588483..6032ed9 100644
--- a/modules/sensors/dynamic_sensor/HidRawDevice.cpp
+++ b/modules/sensors/dynamic_sensor/HidRawDevice.cpp
@@ -204,7 +204,7 @@
     int res = ::ioctl(mDevFd, HIDIOCGFEATURE(size), mIoBuffer.data());
     if (res < 0) {
         LOG_E << "HidRawDevice::getFeature: feature " << static_cast<int>(id)
-              << " ioctl returns " << res << " (" << ::strerror(res) << ")" << LOG_ENDL;
+              << " ioctl returned " << res << ", errno: " << ::strerror(errno) << LOG_ENDL;
         return false;
     }
 
@@ -249,8 +249,8 @@
     std::copy(in.begin(), in.end(), &mIoBuffer[1]);
     int res = ::ioctl(mDevFd, HIDIOCSFEATURE(size), mIoBuffer.data());
     if (res < 0) {
-        LOG_E << "HidRawDevice::setFeature: feature " << id << " ioctl returns " << res
-              << " (" << ::strerror(res) << ")" << LOG_ENDL;
+        LOG_E << "HidRawDevice::setFeature: feature " << id << " ioctl returned " << res
+              << ", errno: " << ::strerror(errno) << LOG_ENDL;
         return false;
     }
     return true;
@@ -287,8 +287,8 @@
         res = ::write(mDevFd, data.data(), size);
     }
     if (res < 0) {
-        LOG_E << "HidRawDevice::sendReport: output " << id << " write returns " << res
-              << " (" << ::strerror(res) << ")" << LOG_ENDL;
+        LOG_E << "HidRawDevice::sendReport: output " << id << " write returned "
+              << res << ", errno: " << ::strerror(errno) << LOG_ENDL;
         return false;
     }
     return true;
@@ -302,8 +302,8 @@
     uint8_t buffer[256];
     int res = ::read(mDevFd, buffer, 256);
     if (res < 0) {
-        LOG_E << "HidRawDevice::receiveReport: read returns " << res
-              << " (" << ::strerror(res) << ")" << LOG_ENDL;
+        LOG_E << "HidRawDevice::receiveReport: read returned " << res
+              << ", errno: " << ::strerror(errno) << LOG_ENDL;
         return false;
     }
 

modules/usbaudio/audio_hal.c

diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c
index fe921d6..616c4a6 100644
--- a/modules/usbaudio/audio_hal.c
+++ b/modules/usbaudio/audio_hal.c
@@ -1723,10 +1723,16 @@
     if (!wasStandby) {
         device_lock(adev);
         if (in != NULL) {
-            start_input_stream(in);
+            ret = start_input_stream(in);
+            if (!ret) {
+                in->standby = false;
+            }
         }
         if (out != NULL) {
-            start_output_stream(out);
+            ret = start_output_stream(out);
+            if (!ret) {
+                out->standby = false;
+            }
         }
         device_unlock(adev);
     }