Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

* commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56':
  Fix problem in AudioEffect::command() status.
This commit is contained in:
Eric Laurent
2010-09-02 12:48:40 -07:00
committed by Android Git Automerger
parent d0743dfbee 32ec1ad17f
commit 937056c1a7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/audioflinger/AudioFlinger.cpp
View File

@@ -5992,12 +5992,14 @@ status_t AudioFlinger::EffectHandle::command(uint32_t cmdCode,
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 @@ status_t AudioFlinger::EffectHandle::command(uint32_t cmdCode,
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();
}