summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-18 20:52:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-18 20:52:42 +0000
commitc7e05b0fc54f9ad22c6d219bf8cf6f10f8d9ba9c (patch)
tree7936019ac07522ded8e35362289f05201f6db34c /services/audiopolicy
parentda677084cf68b62063815217156e7b262b493c3d (diff)
parent0c282de73240b1efce64558ab2fa0a8be1f4292b (diff)
downloadframeworks_av-c7e05b0fc54f9ad22c6d219bf8cf6f10f8d9ba9c.zip
frameworks_av-c7e05b0fc54f9ad22c6d219bf8cf6f10f8d9ba9c.tar.gz
frameworks_av-c7e05b0fc54f9ad22c6d219bf8cf6f10f8d9ba9c.tar.bz2
am 0c282de7: am 77658a06: Merge "AudioPolicyService: malloc/delete pair"
* commit '0c282de73240b1efce64558ab2fa0a8be1f4292b': AudioPolicyService: malloc/delete pair
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/AudioPolicyService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audiopolicy/AudioPolicyService.cpp b/services/audiopolicy/AudioPolicyService.cpp
index 49145a5..a052e04 100644
--- a/services/audiopolicy/AudioPolicyService.cpp
+++ b/services/audiopolicy/AudioPolicyService.cpp
@@ -856,7 +856,7 @@ effect_param_t *AudioPolicyService::loadEffectParameter(cnode *root)
return fx_param;
error:
- delete fx_param;
+ free(fx_param);
return NULL;
}