commit 001b8abafad96ccc651f37c336e027f008f571f6
author Android Build Merger (Role) <android-build-merger@google.com> Wed May 24 16:43:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 24 16:43:39 2017 +0000
tree 3f8d28412f31ee1f14a3bc4b1ee0c1d458a1ddf4
parent f963990ff65ffdd5ab48d63a430441d0546998d2
parent 16ffc614ce2dab01223919bcd71b9825232e8052

Merge "Merge "TRON: Smart selection events that don't change the selection." into oc-dev am: afea5e8ca4 am: ff4cd1e639"

services/core/jni/com_android_server_location_ContextHubService.cpp

diff --git a/services/core/jni/com_android_server_location_ContextHubService.cpp b/services/core/jni/com_android_server_location_ContextHubService.cpp
index 20466eb..d59bc10 100644
--- a/services/core/jni/com_android_server_location_ContextHubService.cpp
+++ b/services/core/jni/com_android_server_location_ContextHubService.cpp
@@ -513,7 +513,7 @@
 
     if (!txnInfo || instanceId < 0) {
         returnId(instanceId);
-        free(txnInfo);
+        delete txnInfo;
         return -1;
     }
 
@@ -526,7 +526,7 @@
 
     if (db.txnManager.addTxn(CONTEXT_HUB_LOAD_APP, txnInfo) != 0) {
         returnId(instanceId);
-        free(txnInfo);
+        delete txnInfo;
         return -1;
     }
 
@@ -543,7 +543,7 @@
     *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;
     }