diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-10-11 09:49:03 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-10-11 09:49:05 -0700 |
commit | d5a4658cea8def24155849a8621608155dcba05c (patch) | |
tree | c7bb892a86fc9c9fe3f3c1b9447fa1ecd8b36897 /packages/ExternalStorageProvider | |
parent | 64be26fad743ae1d8b5f8e5c61b2e7db18379f8b (diff) | |
download | frameworks_base-d5a4658cea8def24155849a8621608155dcba05c.zip frameworks_base-d5a4658cea8def24155849a8621608155dcba05c.tar.gz frameworks_base-d5a4658cea8def24155849a8621608155dcba05c.tar.bz2 |
Treat dates near epoch as unknown.
Also document that rootIds need to be stable, so removable media
roots should use the media serial number.
Bug: 11151557
Change-Id: I1f3dcabcd0474f1bf92d2cafb0f37e82abe34e05
Diffstat (limited to 'packages/ExternalStorageProvider')
-rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 9328b33..189e985 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -73,7 +73,11 @@ public class ExternalStorageProvider extends DocumentsProvider { mIdToRoot = 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 { final String rootId = "primary"; @@ -182,8 +186,13 @@ public class ExternalStorageProvider extends DocumentsProvider { row.add(Document.COLUMN_DISPLAY_NAME, displayName); row.add(Document.COLUMN_SIZE, file.length()); row.add(Document.COLUMN_MIME_TYPE, mimeType); - row.add(Document.COLUMN_LAST_MODIFIED, file.lastModified()); 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 |