Merge "jni: 64-bit compile issue" (5daf51c0) · Commits · e / os / android_frameworks_base

media/jni/android_mtp_MtpDatabase.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -17,11 +17,12 @@
		#define LOG_TAG "MtpDatabaseJNI"
		#include "utils/Log.h"

		#include <stdio.h>
		#include <assert.h>
		#include <fcntl.h>
		#include <inttypes.h>
		#include <limits.h>
		#include <stdio.h>
		#include <unistd.h>
		#include <fcntl.h>

		#include "jni.h"
		#include "JNIHelp.h"
		@@ -388,7 +389,7 @@ MtpResponseCode MyMtpDatabase::getObjectPropertyValue(MtpObjectHandle handle,
		// release date is stored internally as just the year
		if (property == MTP_PROPERTY_ORIGINAL_RELEASE_DATE) {
		char date[20];
		snprintf(date, sizeof(date), "%04lld0101T000000", longValue);
		snprintf(date, sizeof(date), "%04" PRId64 "0101T000000", longValue);
		packet.putString(date);
		goto out;
		}
		@@ -645,7 +646,7 @@ MtpResponseCode MyMtpDatabase::setDevicePropertyValue(MtpDeviceProperty property
		return result;
		}

		MtpResponseCode MyMtpDatabase::resetDeviceProperty(MtpDeviceProperty property) {
		MtpResponseCode MyMtpDatabase::resetDeviceProperty(MtpDeviceProperty /property/) {
		return -1;
		}

		@@ -1090,7 +1091,7 @@ android_mtp_MtpDatabase_finalize(JNIEnv *env, jobject thiz)
		}

		static jstring
		android_mtp_MtpPropertyGroup_format_date_time(JNIEnv *env, jobject thiz, jlong seconds)
		android_mtp_MtpPropertyGroup_format_date_time(JNIEnv env, jobject /thiz*/, jlong seconds)
		{
		char date[20];
		formatDateTime(seconds, date, sizeof(date));