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

Commit a0abb02d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "use MediaAnalyticsItem::create() instead of new"

parents edbe3aa1 e9b9c98a

media/jni/android_media_MediaExtractor.cpp

+2 −6
Original line number Diff line number Diff line
@@ -913,13 +913,9 @@ android_media_MediaExtractor_native_getMetrics(JNIEnv * env, jobject thiz) 
    }



    // build and return the Bundle

    MediaAnalyticsItem *item = new MediaAnalyticsItem;

    std::unique_ptr<MediaAnalyticsItem> item(MediaAnalyticsItem::create());

    item->readFromParcel(reply);

    jobject mybundle = MediaMetricsJNI::writeMetricsToBundle(env, item, NULL);



    // housekeeping

    delete item;

    item = NULL;

    jobject mybundle = MediaMetricsJNI::writeMetricsToBundle(env, item.get(), NULL);



    return mybundle;

}

media/jni/android_media_MediaPlayer.cpp

+2 −6
Original line number Diff line number Diff line
@@ -682,13 +682,9 @@ android_media_MediaPlayer_native_getMetrics(JNIEnv *env, jobject thiz) 
        return (jobject) NULL;

    }



    MediaAnalyticsItem *item = new MediaAnalyticsItem;

    std::unique_ptr<MediaAnalyticsItem> item(MediaAnalyticsItem::create());

    item->readFromParcel(p);

    jobject mybundle = MediaMetricsJNI::writeMetricsToBundle(env, item, NULL);



    // housekeeping

    delete item;

    item = NULL;

    jobject mybundle = MediaMetricsJNI::writeMetricsToBundle(env, item.get(), NULL);



    return mybundle;

}

media/jni/android_media_MediaRecorder.cpp

+2 −6
Original line number Diff line number Diff line
@@ -664,15 +664,11 @@ android_media_MediaRecorder_native_getMetrics(JNIEnv *env, jobject thiz) 
    }



    // build and return the Bundle

    MediaAnalyticsItem *item = new MediaAnalyticsItem;

    std::unique_ptr<MediaAnalyticsItem> item(MediaAnalyticsItem::create());

    item->readFromParcel(reply);

    jobject mybundle = MediaMetricsJNI::writeMetricsToBundle(env, item, NULL);

    jobject mybundle = MediaMetricsJNI::writeMetricsToBundle(env, item.get(), NULL);



    // housekeeping

    delete item;

    item = NULL;

    return mybundle;



}



static jboolean