summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-18 17:41:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-18 17:41:42 +0000
commitd8590167fec151cc2e8f6e28e406c99882f40884 (patch)
tree6d266adb3ec0e7c1337eed3115005a67a72861b2 /services
parent3327597fe780a076a0755c7a4f1aff895c531dad (diff)
parent77658a069c81a0d5b4a1b81443b470a3ea64cab0 (diff)
downloadframeworks_av-d8590167fec151cc2e8f6e28e406c99882f40884.zip
frameworks_av-d8590167fec151cc2e8f6e28e406c99882f40884.tar.gz
frameworks_av-d8590167fec151cc2e8f6e28e406c99882f40884.tar.bz2
am 77658a06: Merge "AudioPolicyService: malloc/delete pair"
* commit '77658a069c81a0d5b4a1b81443b470a3ea64cab0': AudioPolicyService: malloc/delete pair
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/AudioPolicyService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp
index 646a317..a37272d 100644
--- a/services/audioflinger/AudioPolicyService.cpp
+++ b/services/audioflinger/AudioPolicyService.cpp
@@ -1301,7 +1301,7 @@ effect_param_t *AudioPolicyService::loadEffectParameter(cnode *root)
return fx_param;
error:
- delete fx_param;
+ free(fx_param);
return NULL;
}