Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce03086 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by android-build-merger
Browse files

Merge "Use the new radio_metadata wrapper for safer memory management." am:... 

Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c am: e163e7b9 am: bb15b50f
am: aa704263

Change-Id: I53b501fe3460165cbb5dd65b7d4427ca17b2e412
parents 3f5d1ec2 aa704263

core/jni/android_hardware_Radio.cpp

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "JNIHelp.h"

#include "core_jni_helpers.h"

#include <system/radio.h>

#include <system/radio_metadata.h>

#include <system/RadioMetadataWrapper.h>

#include <radio/RadioCallback.h>

#include <radio/Radio.h>

#include <utils/RefBase.h>
@@ -752,7 +752,7 @@ android_hardware_Radio_getProgramInformation(JNIEnv *env, jobject thiz, jobjectA 
    }



    struct radio_program_info nInfo;

    radio_metadata_allocate(&nInfo.metadata, 0, 0);

    RadioMetadataWrapper metadataWrapper(&nInfo.metadata);

    jobject jInfo = NULL;

    int jStatus;
@@ -770,7 +770,6 @@ exit: 
    if (jInfo != NULL) {

        env->DeleteLocalRef(jInfo);

    }

    radio_metadata_deallocate(nInfo.metadata);

    return jStatus;

}