diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-09 15:53:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 15:53:43 -0800 |
| commit | 8fe7ca1d7ddaf9faace4a12666381b14e73a3a4b (patch) | |
| tree | 45136d3339fd32364a98d989fdc33ff5254b983a /media | |
| parent | 23ad53d231fbaa966220a0f56e22f070fc984d32 (diff) | |
| parent | 18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896 (diff) | |
| download | frameworks_base-8fe7ca1d7ddaf9faace4a12666381b14e73a3a4b.zip frameworks_base-8fe7ca1d7ddaf9faace4a12666381b14e73a3a4b.tar.gz frameworks_base-8fe7ca1d7ddaf9faace4a12666381b14e73a3a4b.tar.bz2 | |
am 18d8a074: am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896':
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_mtp_MtpDevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp index fd32665..f5fcb4e 100644 --- a/media/jni/android_mtp_MtpDevice.cpp +++ b/media/jni/android_mtp_MtpDevice.cpp @@ -311,9 +311,9 @@ android_mtp_MtpDevice_get_object_info(JNIEnv *env, jobject thiz, jint objectID) if (objectInfo->mName) env->SetObjectField(info, field_objectInfo_name, env->NewStringUTF(objectInfo->mName)); if (objectInfo->mDateCreated) - env->SetLongField(info, field_objectInfo_dateCreated, objectInfo->mDateCreated); + env->SetLongField(info, field_objectInfo_dateCreated, objectInfo->mDateCreated * 1000LL); if (objectInfo->mDateModified) - env->SetLongField(info, field_objectInfo_dateModified, objectInfo->mDateModified); + env->SetLongField(info, field_objectInfo_dateModified, objectInfo->mDateModified * 1000LL); if (objectInfo->mKeywords) env->SetObjectField(info, field_objectInfo_keywords, env->NewStringUTF(objectInfo->mKeywords)); |