commit 844698646bed1ad587c2d244760ebf63aa64762f
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Jan 27 20:48:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 27 20:48:42 2017 +0000
tree e731a5dfb65889cf1df386e8e1d812bb19d80bac
parent 1784ec91786ed3a9e1fffcaa20fec8c33830b1ad
parent be706d6281562d19d163cad2aec12a218bf3ef43

Merge "Use the new radio_metadata wrapper for safer memory management." am: f41c781cf4 am: 9ae457ec7b am: 5d8c976795
am: be706d6281

Change-Id: Iba94e3e82dff749f37ec6643a19cd77875841e7a

radio/IRadio.cpp

diff --git a/radio/IRadio.cpp b/radio/IRadio.cpp
index d475805..72f3b68 100644
--- a/radio/IRadio.cpp
+++ b/radio/IRadio.cpp
@@ -16,6 +16,7 @@
 */
 
 #define LOG_TAG "IRadio"
+//#define LOG_NDEBUG 0
 #include <utils/Log.h>
 #include <utils/Errors.h>
 #include <binder/IMemory.h>
@@ -23,7 +24,7 @@
 #include <radio/IRadioService.h>
 #include <radio/IRadioClient.h>
 #include <system/radio.h>
-#include <system/radio_metadata.h>
+#include <system/RadioMetadataWrapper.h>
 
 namespace android {
 
@@ -300,12 +301,9 @@
         case GET_PROGRAM_INFORMATION: {
             CHECK_INTERFACE(IRadio, data, reply);
             struct radio_program_info info;
+            RadioMetadataWrapper metadataWrapper(&info.metadata);
 
-            status_t status = radio_metadata_allocate(&info.metadata, 0, 0);
-            if (status != NO_ERROR) {
-                return status;
-            }
-            status = getProgramInformation(&info);
+            status_t status = getProgramInformation(&info);
             reply->writeInt32(status);
             if (status == NO_ERROR) {
                 reply->write(&info, sizeof(struct radio_program_info));
@@ -317,7 +315,6 @@
                     reply->writeUint32(0);
                 }
             }
-            radio_metadata_deallocate(info.metadata);
             return NO_ERROR;
         }
         case HAS_CONTROL: {