From 5caf5fdc6fcb265193144f805f5caff69d8bde20 Mon Sep 17 00:00:00 2001
From: Zhizhou Yang <zhizhouy@google.com>
Date: Tue, 14 Feb 2017 16:16:33 -0800
Subject: [PATCH] Fix MemoryLeak warning in frameworks/base/services

Fixed warning: Memory allocated by 'new' should be deallocated by
'delete', not free().

Bug: 31999593

Test: mmma framework/base/services, with WITH_TIDY and
WITH_STATIC_ANALYZER, the warning has gone.

Change-Id: Ib19fd2f210468b712ee72a4760d2abe8355c59e2
---
 .../jni/com_android_server_location_ContextHubService.cpp   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/jni/com_android_server_location_ContextHubService.cpp b/services/core/jni/com_android_server_location_ContextHubService.cpp
index 05ef0d11e16cb..ad4b2020d292f 100644
--- a/services/core/jni/com_android_server_location_ContextHubService.cpp
+++ b/services/core/jni/com_android_server_location_ContextHubService.cpp
@@ -511,7 +511,7 @@ int startLoadAppTxn(uint64_t appId, int hubHandle) {
 
     if (!txnInfo || instanceId < 0) {
         returnId(instanceId);
-        free(txnInfo);
+        delete txnInfo;
         return -1;
     }
 
@@ -524,7 +524,7 @@ int startLoadAppTxn(uint64_t appId, int hubHandle) {
 
     if (db.txnManager.addTxn(CONTEXT_HUB_LOAD_APP, txnInfo) != 0) {
         returnId(instanceId);
-        free(txnInfo);
+        delete txnInfo;
         return -1;
     }
 
@@ -541,7 +541,7 @@ int startUnloadAppTxn(jint appInstanceHandle) {
     *txnData = appInstanceHandle;
 
     if (db.txnManager.addTxn(CONTEXT_HUB_UNLOAD_APP, txnData) != 0) {
-        free(txnData);
+        delete txnData;
         ALOGW("Cannot start transaction to unload app");
         return -1;
     }