Merge "MediaMetrics: Update the put helper for more types" (8c73faaf) · Commits · e / os / android_frameworks_base

media/jni/android_media_MediaMetricsJNI.cpp

+18 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <jni.h>
		#include <media/MediaMetricsItem.h>
		#include <nativehelper/JNIHelp.h>
		#include <variant>

		#include "android_media_MediaMetricsJNI.h"
		#include "android_os_Parcel.h"
		@@ -74,18 +75,30 @@ struct BundleHelper {
		}

		template<>
		void put(jstring keyName, const char * const& value) {
		env->CallVoidMethod(bundle, putStringID, keyName, env->NewStringUTF(value));
		void put(jstring keyName, const std::string& value) {
		env->CallVoidMethod(bundle, putStringID, keyName, env->NewStringUTF(value.c_str()));
		}

		template<>
		void put(jstring keyName, char * const& value) {
		void put(jstring keyName, const std::pair<int64_t, int64_t>& value) {
		; // rate is currently ignored
		}

		template<>
		void put(jstring keyName, const std::monostate& value) {
		; // none is currently ignored
		}

		// string char * helpers

		template<>
		void put(jstring keyName, const char * const& value) {
		env->CallVoidMethod(bundle, putStringID, keyName, env->NewStringUTF(value));
		}

		template<>
		void put(jstring keyName, const std::pair<int64_t, int64_t>& value) {
		; // rate is currently ignored
		void put(jstring keyName, char * const& value) {
		env->CallVoidMethod(bundle, putStringID, keyName, env->NewStringUTF(value));
		}

		// We allow both jstring and non-jstring variants.