commit a52682416e89da1a5c086eee359f7c35cb126ea8
author Eric Laurent <elaurent@google.com> Thu Sep 02 12:48:40 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 02 12:48:40 2010 -0700
tree cd9a94f944055d92421fec6746ada3b1d8a09103
parent 031ecf372128a786a9ae84aee9c681af7a0c7db1
parent 34c8d61734bcc19f36a652faf52f855b29f3f62d

am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into gingerbread

Merge commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56' into gingerbread-plus-aosp

* commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56':
  Fix problem in AudioEffect::command() status.

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 1acdaaf..3770b55 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -5992,12 +5992,14 @@
                                             p,
                                             &rsize,
                                             &reply);
-            if (ret == NO_ERROR) {
-                if (reply != NO_ERROR) {
-                    status = reply;
-                }
-            } else {
+            // stop at first error encountered
+            if (ret != NO_ERROR) {
                 status = ret;
+                *(int *)pReplyData = reply;
+                break;
+            } else if (reply != NO_ERROR) {
+                *(int *)pReplyData = reply;
+                break;
             }
             mCblk->serverIndex += size;
         }
@@ -6005,8 +6007,10 @@
         mCblk->clientIndex = 0;
         return status;
     } else if (cmdCode == EFFECT_CMD_ENABLE) {
+        *(int *)pReplyData = NO_ERROR;
         return enable();
     } else if (cmdCode == EFFECT_CMD_DISABLE) {
+        *(int *)pReplyData = NO_ERROR;
         return disable();
     }