commit 4ec4e6b1073b0dc1b608aeeaf4e3129ea1a725c8
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 03 18:49:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 03 18:49:48 2017 +0000
tree f42a53bfd8e47fb76e9721d83c4df808bb5691ef
parent 832fcce0c4bdc748bc4cb75101615e77769ec4e8
parent d2ae9cd57cfbb6f2f4dd0a91dbc7ea2e9e5fc447

Merge "audiohal: Check for EINTR and retry when waiting for EventFlag"

media/libaudiohal/EffectHalHidl.cpp

diff --git a/media/libaudiohal/EffectHalHidl.cpp b/media/libaudiohal/EffectHalHidl.cpp
index db115ef..539558d 100644
--- a/media/libaudiohal/EffectHalHidl.cpp
+++ b/media/libaudiohal/EffectHalHidl.cpp
@@ -194,8 +194,8 @@
         }
         return analyzeResult(retval);
     }
-    if (ret == -EAGAIN) {
-        // This normally retries no more than once.
+    if (ret == -EAGAIN || ret == -EINTR) {
+        // Spurious wakeup. This normally retries no more than once.
         goto retry;
     }
     return ret;

media/libaudiohal/StreamHalHidl.cpp

diff --git a/media/libaudiohal/StreamHalHidl.cpp b/media/libaudiohal/StreamHalHidl.cpp
index 77ba716..5b06b73 100644
--- a/media/libaudiohal/StreamHalHidl.cpp
+++ b/media/libaudiohal/StreamHalHidl.cpp
@@ -360,8 +360,8 @@
         }
         return ret;
     }
-    if (ret == -EAGAIN) {
-        // This normally retries no more than once.
+    if (ret == -EAGAIN || ret == -EINTR) {
+        // Spurious wakeup. This normally retries no more than once.
         goto retry;
     }
     return ret;
@@ -620,8 +620,8 @@
         }
         return ret;
     }
-    if (ret == -EAGAIN) {
-        // This normally retries no more than once.
+    if (ret == -EAGAIN || ret == -EINTR) {
+        // Spurious wakeup. This normally retries no more than once.
         goto retry;
     }
     return ret;