summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-20 12:09:01 -0700
committerMark Salyzyn <salyzyn@google.com>2014-03-26 11:28:45 -0700
commitaeb75fc5a3dc51bf9d5220647a68c48644c66ea8 (patch)
tree58d11d699581e92657ba0f84b80926d255615e1e /media/jni
parent491eaf2255a95186e84092eae4ec43582eebb37b (diff)
downloadframeworks_base-aeb75fc5a3dc51bf9d5220647a68c48644c66ea8.zip
frameworks_base-aeb75fc5a3dc51bf9d5220647a68c48644c66ea8.tar.gz
frameworks_base-aeb75fc5a3dc51bf9d5220647a68c48644c66ea8.tar.bz2
jni: 64-bit compile issue
- switch to PRId64 - some unused parameter warning suppression Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/android_mtp_MtpDatabase.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp
index 72ce3cc..8129c0d 100644
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -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));