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

am 6e19feb4: Merge "Treat dates near epoch as unknown." into klp-dev

Browse Source 
* commit '6e19feb4f3da02916754636d3ade340dcd5412d5':
  Treat dates near epoch as unknown.
This commit is contained in:
Jeff Sharkey
2013-10-11 12:23:35 -07:00
committed by Android Git Automerger
parent 4732660a50 6e19feb4f3
commit ce05cbc5ec
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
View File

@ -73,7 +73,11 @@ public class ExternalStorageProvider extends DocumentsProvider {
mIdToRoot = Maps.newHashMap(); mIdToRoot = Maps.newHashMap();
mIdToPath = Maps.newHashMap(); mIdToPath = Maps.newHashMap();
// TODO: support multiple storage devices // TODO: support multiple storage devices, requiring that volume serial
// number be burned into rootId so we can identify files from different
// volumes. currently we only use a static rootId for emulated storage,
// since that storage never changes.
if (!Environment.isExternalStorageEmulated()) return true;
try { try {
final String rootId = "primary"; final String rootId = "primary";
@ -182,8 +186,13 @@ public class ExternalStorageProvider extends DocumentsProvider {
row.add(Document.COLUMN_DISPLAY_NAME, displayName); row.add(Document.COLUMN_DISPLAY_NAME, displayName);
row.add(Document.COLUMN_SIZE, file.length()); row.add(Document.COLUMN_SIZE, file.length());
row.add(Document.COLUMN_MIME_TYPE, mimeType); row.add(Document.COLUMN_MIME_TYPE, mimeType);
row.add(Document.COLUMN_LAST_MODIFIED, file.lastModified());
row.add(Document.COLUMN_FLAGS, flags); row.add(Document.COLUMN_FLAGS, flags);
// Only publish dates reasonably after epoch
long lastModified = file.lastModified();
if (lastModified > 31536000000L) {
row.add(Document.COLUMN_LAST_MODIFIED, lastModified);
}
} }
@Override @Override