drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair

Browse Source 
Merge commit '9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp

* commit '9db1a37cc48a01a66ee8026de303faaf4a83667d':
  DATE_TAKEN should be in millisecond instead of second.
This commit is contained in:
Ray Chen
2009-12-02 05:35:12 -08:00
committed by Android Git Automerger
parent f12a5c9b12 9db1a37cc4
commit cb6203cdcb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/MediaScanner.java
View File

@ -640,13 +640,13 @@ public class MediaScanner
map.put(Video.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaFile.UNKNOWN_STRING)); map.put(Video.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaFile.UNKNOWN_STRING));
map.put(Video.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING)); map.put(Video.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING));
map.put(Video.Media.DURATION, mDuration); map.put(Video.Media.DURATION, mDuration);
map.put(Video.Media.DATE_TAKEN, mLastModified); map.put(Video.Media.DATE_TAKEN, mLastModified * 1000);
// FIXME - add RESOLUTION // FIXME - add RESOLUTION
} else if (MediaFile.isImageFileType(mFileType)) { } else if (MediaFile.isImageFileType(mFileType)) {
// FIXME - add DESCRIPTION // FIXME - add DESCRIPTION
// DATE_TAKEN will be overridden later if this is a JPEG image whose EXIF data // DATE_TAKEN will be overridden later if this is a JPEG image whose EXIF data
// contains date time information. // contains date time information.
map.put(Images.Media.DATE_TAKEN, mLastModified); map.put(Images.Media.DATE_TAKEN, mLastModified * 1000);
} else if (MediaFile.isAudioFileType(mFileType)) { } else if (MediaFile.isAudioFileType(mFileType)) {
map.put(Audio.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaFile.UNKNOWN_STRING)); map.put(Audio.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaFile.UNKNOWN_STRING));
map.put(Audio.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING)); map.put(Audio.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING));
@ -746,7 +746,7 @@ public class MediaScanner
long time = exif.getDateTime(); long time = exif.getDateTime();
if (time != -1) { if (time != -1) {
values.put(Images.Media.DATE_TAKEN, time); values.put(Images.Media.DATE_TAKEN, time * 1000);
} }
int orientation = exif.getAttributeInt( int orientation = exif.getAttributeInt(