9b70f44b2a773aa56db9b643ae98b287703c1bd1 |
|
17-Aug-2015 |
Jorim Jaggi <jjaggi@google.com> |
Fix documentation issue Bug: 23038621 Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
/frameworks/base/core/java/android/provider/MediaStore.java
|
0e3de6cacaffcfeda4d6353be61e2f1f9ed80705 |
|
30-Jul-2015 |
Dianne Hackborn <hackbod@google.com> |
Change MNC codename to just M. Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
/frameworks/base/core/java/android/provider/MediaStore.java
|
7008b51817361443fc6f136c5b187e1d471c94f5 |
|
25-Jun-2015 |
Svetoslav <svetoslavganov@google.com> |
Prevent certain actions of app has revoked permissions bug:21808294 Change-Id: I7214c1fe47c15fe185423a54a74b58caf8d82daa
/frameworks/base/core/java/android/provider/MediaStore.java
|
d944986fbdb3d45fab9ae4120af76ca4f6b0909c |
|
29-May-2015 |
Jorim Jaggi <jjaggi@google.com> |
Fix API review: Camera prewarm Let the intent receiver of a camea launch intent declare a prewarm service instead of sending broadcasts. Bug: 21347653 Change-Id: I11e31aad4f788ad90eb46a661b819d3e808ddb51
/frameworks/base/core/java/android/provider/MediaStore.java
|
a86790bf23a98ede5fc0c29b996a5229e08181cd |
|
03-Apr-2015 |
Jorim Jaggi <jjaggi@google.com> |
Add Camera prewarm intent. Also adds a test app for testing this intent. In addition, the secure camera gets launched in the background to fix jank while sending the intent. Bug: 20016619 Change-Id: I7bb7e22ddaf5dc67fc09b9e63e5f3d10fe8e3ee4
/frameworks/base/core/java/android/provider/MediaStore.java
|
0e24cb7fb5b2b1941d8340cbe577dbfcb624ccdb |
|
17-Feb-2015 |
Marco Nelissen <marcone@google.com> |
Fix NPE Path can be null if sd card was ejected, and we shouldn't make a thumbnail in that case. Bug: 19380821 Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
/frameworks/base/core/java/android/provider/MediaStore.java
|
955d8d69ea6caabce1461dc25b339b9bf9dc61a6 |
|
08-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
Put in real "code" (aka marketing) name. Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
/frameworks/base/core/java/android/provider/MediaStore.java
|
d1c99b1fe85ed03261a77a14ae52e7fa3a6e523a |
|
04-Jul-2014 |
Nicolas Prevot <nprevot@google.com> |
Migrate extras to ClipData for image/video capture intents. The intents ACTION_IMAGE_CAPTURE, ACTION_IMAGE_CAPTURE_SECURE and ACTION_VIDEO_CAPTURE are now handled in a way similar to ACTION_SEND and ACTION_SEND_MULTIPLE. Migrate the uri in the EXTRA_OUTPUT extra to clipData, and add the flag GRANT_WRITE_URI_PERMISSION. The userIds are now added to extra uris in the process receiving the intent, (not in the system process), because the system process may not be able to parcel/unparcel the extras. BUG: 15534203 Change-Id: I8f79666b726bc6d7745bf777ad3c7518945c5cc3
/frameworks/base/core/java/android/provider/MediaStore.java
|
d3afc9c1d8b1585a1d6e0d3d840e9dd93081ec0c |
|
24-Jun-2014 |
Marco Nelissen <marcone@google.com> |
am 909a1b2e: am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug" * commit '909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14': Fix thumbnail bug
|
909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14 |
|
23-Jun-2014 |
Marco Nelissen <marcone@google.com> |
am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug" * commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb': Fix thumbnail bug
|
b416af13e748aca18a220a9f4a5232306af9c830 |
|
20-Jun-2014 |
Marco Nelissen <marcone@google.com> |
Fix thumbnail bug When there was no thumbnail for a given image, the getThumbNail() convenience method could return a previously-returned thumbnail instead of null. b/15771860 https://code.google.com/p/android/issues/detail?id=40714 Change-Id: Ibd18e048145bf347469f800afdf436247ea6b693
/frameworks/base/core/java/android/provider/MediaStore.java
|
de6f4701f8cf2fbc8d51af203bd9f9cbb7233bba |
|
06-Jun-2014 |
Matt Casey <mrcasey@google.com> |
Make MediaStore.Audio.Radio not instantiable Types which only contain constants or static methods should not be instantiable. Bug: 15430601 Change-Id: I515740e677ae4c72afc09e943e20a72ea27cb17e
/frameworks/base/core/java/android/provider/MediaStore.java
|
92f4a3465ea2521523b5659f8006097e07a9be58 |
|
18-Apr-2014 |
Ricardo Cervera <rcervera@google.com> |
am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs * commit 'fa711a33be265d1fcd08efd850085615ec66dd89': docs: Added the play from search intent. Bug: 13473141.
|
a3b13847b0c966ab40bad6959380ec02ee17288a |
|
02-Apr-2014 |
Ricardo Cervera <rcervera@google.com> |
docs: Added the play from search intent. Bug: 13473141. Change-Id: Icf483b5e0446e064b32a782717408484d5806859
/frameworks/base/core/java/android/provider/MediaStore.java
|
1dbf1f81e29405674c5da5baa1ca59c18f54ad87 |
|
27-Mar-2014 |
Matt Casey <mrcasey@google.com> |
Add a mediastore constant for playlists. This is a followup to https://googleplex-android-review.git.corp.google.com/415218 I'm writing this change at the request of elmas@. Bug: 13657009 Change-Id: I970cc59a33af2162c2488c4ddf628f7a73009cd6
/frameworks/base/core/java/android/provider/MediaStore.java
|
bd7bcf0fba1a991e80ea279b090aa584707fdabf |
|
06-Feb-2014 |
Matt Casey <mrcasey@google.com> |
Add more MediaStore constants for playback intents Constants are derived from this doc: https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv That doc contains the full explanation of these changes. I'm making this change on behalf of {elmas,pengr} who don't have android source access but designed this in collaboration with rharagutchi on the play music team. I'll probably have to route any significant questions through them. Bug: 12874557 Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
/frameworks/base/core/java/android/provider/MediaStore.java
|
32cd2fb59601432e134e10d2c6720b2e70b6c2fe |
|
02-Oct-2013 |
Jeff Sharkey <jsharkey@android.com> |
Docs change: annotate media intent actions. Bug: 11043141 Change-Id: I66777c5ce25014d8e64da5b4ce3f70334befb0b7
/frameworks/base/core/java/android/provider/MediaStore.java
|
9d0843df7e3984293dc4ab6ee2f9502e898b63aa |
|
07-May-2013 |
Jeff Sharkey <jsharkey@android.com> |
Resized thumbnails; async; extend MatrixCursor. When requesting thumbnails, check if their dimensions are larger than requested, and downscale to avoid memory pressure. Load them async and with LruCache. Extend MatrixCursor so that RowBuilder can offer() columns without requiring they know the projection map. This makes it easier to respond to query() calls, where the remote side controls the projection map. Use it to handle custom projections in external storage backend. Update date/time formatting to match spec. Bug: 10333418, 10331689 Change-Id: I7e947a8e8068af8a39b55e6766b3241de4f3fc16
/frameworks/base/core/java/android/provider/MediaStore.java
|
66eb5899574cda2aae905248a58a2bd675247109 |
|
30-Apr-2012 |
Jan Bjernler <jan2.bjernler@sonymobile.com> |
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content MediaStore.Audio.getContentUriForPath() returns an uri to internal storage if anything but /mnt/sdcard/ is sent in. This fix checks if there is an additional sdcard (normally called ext_card) or usb mass storage attached to the device and then returns an uri to the external db. The extra sdcard name and the usb mass storage name info is read from the system environment variable SECONDARY_STORAGE so if a customer chooses to change the name this will work as expected. Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
/frameworks/base/core/java/android/provider/MediaStore.java
|
29f5230dc604537a72842a70991bae71019f8c80 |
|
23-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
|
b1ac72b54b72cb6bb26f6d2b92335189d8669eb0 |
|
21-Sep-2012 |
Florian Uunk <feuunk@google.com> |
Add intents to open text and video from search. We're adding support for searching for text (books, magazines) and video (tv, movies). Bug: 7208141 Change-Id: I19dd2f745518a96b22b02a29c1ab9a89d53cc0cc
/frameworks/base/core/java/android/provider/MediaStore.java
|
edc1a2bbc545a50f98ee8c9409c1861fe3522b11 |
|
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE bug:7141738 Change-Id: If0109671a072e978501e238fe3d7554693a92157
/frameworks/base/core/java/android/provider/MediaStore.java
|
37959ef70f2a0a50e38698cfef1a61fbf8d6b307 |
|
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add secure version of image capture intent. bug:7141738 Change-Id: I77789ffb53e70efd946f331286a895b7a1239661
/frameworks/base/core/java/android/provider/MediaStore.java
|
e590dc6f7dfbd00117acfb7aa2ef35bc94e537bd |
|
07-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE. bug:7053266 Change-Id: I4e00199598f57f11250abeab4ce17ced18f41f14
/frameworks/base/core/java/android/provider/MediaStore.java
|
f88320558fcf39ef23c7d5b63c0ba60e1943d9ff |
|
20-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent. The intent is used to launch camera when the device is secured (e.g. with a pin, password, pattern, or face unlock). bug:5955016 Change-Id: I5470cf7ee9deab9677665ef0566bac88bdfd80c6
/frameworks/base/core/java/android/provider/MediaStore.java
|
ac13cc06ee35a9890d35af25b6cd2df2841e1384 |
|
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Unhide MediaColumns.WIDTH and MediaColumns.HEIGHT. bug:5224359 Change-Id: I3dcaa2ed383e12ae308b28db45cbe8e503610cdc
/frameworks/base/core/java/android/provider/MediaStore.java
|
f76a50ce8fdc6aea22cabc77b2977a1a15a79630 |
|
09-Mar-2012 |
Ken Wakasa <kwakasa@google.com> |
Fix obvious typos under frameworks/base/core Change-Id: Ia5fc3db1bb51824e7523885553be926bcc42d736
/frameworks/base/core/java/android/provider/MediaStore.java
|
c3898820f61700a5a750b6485856e43eb79e2360 |
|
03-Mar-2012 |
Casey Ho <caseyho@google.com> |
Fix incorrect javadoc Change-Id: I7f2cd95ced0f525b2c0ee20b64acbb35893664ed
/frameworks/base/core/java/android/provider/MediaStore.java
|
ac259f17a0a6ba9e363bbf0c268c5942aab392c1 |
|
07-Feb-2012 |
Marco Nelissen <marcone@google.com> |
Make media scanner use new delete-parameter This speeds up the media scan case where many files were deleted or moved. Change-Id: I86e6fc6d0968eebf24923c0b5587b90d309721bb
/frameworks/base/core/java/android/provider/MediaStore.java
|
ca78f3d9aff78c35bc065b0c35a0b3c917f56435 |
|
27-Jan-2012 |
Marco Nelissen <marcone@google.com> |
Handle adding/removing/renaming nomedia paths b/5849015 Change-Id: I3ec7419498d1ecc83db6d4605b3d7610349231f7
/frameworks/base/core/java/android/provider/MediaStore.java
|
6651a638348c15e89e265b0a53c775cac9beafa2 |
|
28-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
Fix application launch shortcuts. Improved quick launch bookmarks to support category-based shortcuts instead of hardcoding package and class names for all apps. Added a set of Intent categories for typical applications on the platform. Added support for some of the HID application launch usages to reduce reliance on quick launch for special purpose keys. Some keyboard vendors have hardcoded launch keys that synthesize "Search + X" type key combos. The goal is to encourage them to stop doing this by implementing more of HID. Bug: 5674723 Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
/frameworks/base/core/java/android/provider/MediaStore.java
|
e1bf8efaff42dc33b7a4663f3c9d50d12de81bcb |
|
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5224359: Add width and height to media store. Change-Id: I27376285a551e648eb0ea010dfdf6b8ed873cdd8
/frameworks/base/core/java/android/provider/MediaStore.java
|
e5d0495d5206167c597efcd81436a0f881f069f9 |
|
30-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
MediaScanner: Move genre table management to MediaProvider Fixes problems introduced with bulk insert support Bug: 5092877 Change-Id: If3c0c9054d5effe0a1d7a75e85635b41ba1591f5 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
e19572ccb5e7963eee9dd1cca150ee752a850e4a |
|
20-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
MediaScanner: Do separate bulk inserts for different media types This should fix a bunch of problems introduced in the original bulk insert implementation Also reverted two changes that are no longer necessary: Revert "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files" This reverts commit 92e1314ad9ddbacfb806405e9aceeea4a8aae19f. Revert "MediaScanner: fix breakage in updates" This reverts commit 45aaa2a345292bb6d600822db602f25e261c0e50. Change-Id: Ibed66393467761c2c1ce48deb09bcac505b7d221
/frameworks/base/core/java/android/provider/MediaStore.java
|
92e1314ad9ddbacfb806405e9aceeea4a8aae19f |
|
15-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files Bug: 5025615 Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
82428a862f325238cfb5646bbd65de3f1a11e7cc |
|
27-Jun-2011 |
Gloria Wang <gwang@google.com> |
- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
/frameworks/base/core/java/android/provider/MediaStore.java
|
1b312039a046532532837efd2dac06390ab506c0 |
|
06-May-2011 |
Marco Nelissen <marcone@google.com> |
Remove MediaStore.Audio.AudioColumns.ALBUM_ART This column doesn't actually exist in the corresponding table, and never has, so the presence of this definition is confusing. Change-Id: I199f9a8effbdc9f45d51060830e3ad83675a0dff
/frameworks/base/core/java/android/provider/MediaStore.java
|
b239b683765f63d79e74b8ba2a8cc2855f236536 |
|
05-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
MTP and media provider support for multiple storage devices: - MTP support for multiple storage units - Add storage_id column to media database for MTP storage ID - Add framework resource for defining mount points and user visible descriptions for multiple volumes - Clean up locking in MtpServer JNI code Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
/frameworks/base/core/java/android/provider/MediaStore.java
|
e7bc746e67a5b9d9cab34bd4ebe06b977772d356 |
|
16-Mar-2011 |
Wu-cheng Li <wuchengli@google.com> |
Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc. Change-Id: Ib0b637ad69a559a328ac812d710b4990fd8b1a87
/frameworks/base/core/java/android/provider/MediaStore.java
|
770d02c2fa8de1430c2c3b778efb6f2717edcd47 |
|
03-Feb-2011 |
Marco Nelissen <marcone@google.com> |
Unhide MediaStore.getVersion so Music2 can use it. Change-Id: I006860fe2bd828ffdc598dc89329eba952fde5b3
/frameworks/base/core/java/android/provider/MediaStore.java
|
3822f73a58af67ea7955f926c7d10335d86572c0 |
|
03-Feb-2011 |
Marco Nelissen <marcone@google.com> |
Add a convenience method for getting the media provider version. b/3350571 Change-Id: I1280a49029aa75643397fab7113b4dd80b639809
/frameworks/base/core/java/android/provider/MediaStore.java
|
ed723b4095828fd6e183b650390bc4725e15886f |
|
27-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Fix javadoc for MediaStore.Files.FileColumns constants BUG: 3370225 Change-Id: Ie793771b131031f8457859990dca7b6fb9ba47aa Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
e222872a77324dd7a1a8b9a11900a0c70bc4d6e8 |
|
20-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
@hide MediaStore.ACTION_MTP_SESSION_END BUG: 3370230 Change-Id: Idc05512930ceab8f91e3ddf0969a3b17deab2f62 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
ee35aff74494e6c0b718e219427af6a6c573b928 |
|
06-Jan-2011 |
Marco Nelissen <marcone@google.com> |
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831 (cherry-picked from GB because of weird automerger failure) Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
/frameworks/base/core/java/android/provider/MediaStore.java
|
a31560598af25d5116effc2a6af0d9be12a0628d |
|
20-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Rename android.provider.Mtp to android.provider.Ptp We are only supporting the PTP subset of MTP in host mode and have no plans for full MTP, so calling it Mtp was misleading. Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore and added it to the public API. Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
0b20b77ff5a67a054695954bc65f1c5c473b348b |
|
04-Nov-2010 |
Mike Lockwood <lockwood@google.com> |
MediaStore: Make definitions for Files table public This provides a public API for the new MediaProvider support for arbitrary file types. MediaProvider is no longer limited to supporting only media (audio, video, image and playlist files). This also allows querying across multiple media file types and supports navigating the directory hierarchy of the media storage via database queries. BUG: 2984284 Change-Id: I6222a6d601a4641cc7e544335e45d05b194532b1 Signed-off-by: Mike Lockwood <lockwood@google.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
bdb05df757847ebf343ad332f319a97f7482957c |
|
26-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MediaStore: Add helper method to create Uri for querying genre for an audio file Change-Id: Ic08260854ef2555682c1a169e7ceb9ecc91628c6 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
c2206a0710a3ca2c29854c1a0638c5ba55629ba2 |
|
16-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Changes to support MediaProvider refactoring Update table columns in MediaStore and adjust media scanner MTP support. Change-Id: Ide41315a6d7650aadb703f93c7e022fc5c40d4dd Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
c37255d5d0fd9e0ec02b0d7cb5c4b235e200d367 |
|
10-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Media scanner support for tracking files of arbitrary type. The native media scanner no longer filters files based on file extension. Audio, video, image and playlist files are handled as before, but non-media files are now inserted into the "files" table, which was originally added to support MTP. Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
8490e66f57506d4e4b05e7c987c7ca34295843e6 |
|
09-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Use separate Uris for MTP to the media provider files table Separating the Uris for local and MTP access to the database will allow us to handle MTP originated queries differently in the provider. Change-Id: I78d1c0a0e656eddee1e17212a79157f67ca46b38 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
13831586874fab1592a9d6f9134a693b0b27bae8 |
|
09-Sep-2010 |
Mike LeBeau <mlebeau@android.com> |
am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9' * commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9': Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
|
2fe6fd055874ff70a9faeaa27716173b12e671fb |
|
09-Sep-2010 |
Mike LeBeau <mlebeau@android.com> |
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action. Change-Id: Ibbc81701cc2412ffd57402d34f22d9764e9df7c2
/frameworks/base/core/java/android/provider/MediaStore.java
|
3b2a62e5b35ea5f8da9d9bee52f75c9c2ebb4ece |
|
08-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Rename the media database's "objects" table to "files" We will be using this table for more than just MTP, so it deserves a more general name. Change-Id: I4c86d7e37ebe778e39699245b0e08af059e677ea Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
9439241d35afc203d47b327619a49b5d70cf722b |
|
25-Aug-2010 |
Chih-Chung Chang <chihchung@google.com> |
resolved conflicts for merge of 20afae51 to master Change-Id: Ief637e412e4d716526de68c7761bdb8cbf436333
|
2ca36196ea97d14cd0ef24439204f6725966d9d7 |
|
24-Aug-2010 |
Chih-Chung Chang <chihchung@google.com> |
Avoid allocating buffer every time getThumbnail is called. Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
/frameworks/base/core/java/android/provider/MediaStore.java
|
9a2046fb5ceeee4d5334274cbff15f1058bb3244 |
|
03-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for syncing MTP playlists MTP playlists now correspond to playlists in the media provider (like those created by the Music app). Change-Id: I085cb3cff003037ad62f0e297fb0cfd3047cb3a2 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
cbaea35759791f083735f7a5c43e0dc0ed228ff1 |
|
17-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Add MTP_OBJECT_ID column name to MediaStore.MediaColumns This column will be added to the images, audio_meta, video and audio_playlist tables to cross reference to the MTP objects table. Renamed MTP_OBJECT_HANDLE (which is used only by the media scanner) to MEDIA_SCANNER_NEW_OBJECT_ID to avoid confusion. Change-Id: I8093485dc0438f408a505e82ffddd0710c7a512c Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
d815f79766984fce499e147ecbacc01914683f74 |
|
12-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Integrate host to device file transfer with the media provider. MTP file transfers happen in two stages. The SendObjectInfo command sends some information about the file and reserves an ObjectHandle for the new file. The file transfer is then performed using the SendObject command. To support this in the media provider, MtpDatabase.beginSendObject receives the information from SendObjectInfo and creates an row for it in the MTP objects table for the new file. After the file transfer has completed, then MtpDatabase.endSendObject is called. In endSendObject, we run the media scanner on the new file, which will add a row to the images, audio, video or audio playlist table. To avoid the media scanner creating a second row for the file in the MTP objects table, we pass the ObjectHandle created in beginSendObject to the media scanner, which then passes it to the media provider via the content values when it performs its insert. Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
fed161799bb40ea4cda19f5ef6c8c2462a0066e4 |
|
09-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MediaProvider: Add constants for media_table and media_id columns in MTP objects table Change-Id: I47396c637e483ea9c71bbb22898d69cb3d00b256 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
d21eac9c70940f2c73da5faaf401dbbc44b70a15 |
|
03-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Use media provider database to implement MTP device support. Uses a new "MTP objects" table in the media provider to support basic enumeration of the external storage file system. Support for accessing audio, video and image metadata in the existing media provider tables will be added in a later commit. The C++ MtpDatabase class is now abstract, to support a proxy subclass that calls through JNI to the Java MtpDatabase class in the media provider. Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305 Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/core/java/android/provider/MediaStore.java
|
1ba38b600e181168c8897220048027a164c68b10 |
|
14-May-2010 |
Ray Chen <raychen@google.com> |
Fix 2655246 file descriptor leak when accessing thumbnails http://b/2655246 Moved from kraken to master (https://android-git.corp.google.com/g/#change,51691) Change-Id: I7d0cffd745311d073415d597eb141e26fe1edcce
/frameworks/base/core/java/android/provider/MediaStore.java
|
2dc7c6c4153380fc64b99d37d763d3f0d1cac04d |
|
19-May-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from open-source master Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
|
8ce072d579e0c0e9329b5a3830155de8da7de4cf |
|
30-Jan-2010 |
Karl Ostmo <kostmo@gmail.com> |
Add and document .nomedia constant for MediaStore (Issue 6365) Change-Id: Ic9c4a784187cd1264584992411916a5beeefd864
/frameworks/base/core/java/android/provider/MediaStore.java
|
44dcf658718fcc0b563dcad50fb59e8fe507cd0a |
|
05-Apr-2010 |
Ray Chen <raychen@google.com> |
Make createVideoThumbnail and createImageThumbnail look consistent. Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
/frameworks/base/core/java/android/provider/MediaStore.java
|
abc2819328c32f2f66506d342c5f560da5107889 |
|
19-Mar-2010 |
Marco Nelissen <marcone@google.com> |
Include "album artist" when inserting items in the media provider. Change-Id: Ic34e2d54557409866dc35c29ee397afdfe874762
/frameworks/base/core/java/android/provider/MediaStore.java
|
edcdbb6d3bb6f66e9fd91b15ef45f4cec5694393 |
|
18-Feb-2010 |
Daniel Sandler <dsandler@google.com> |
Add new action for launching the user's music player app. android.intent.action.MUSIC_PLAYER http://b/2237931
/frameworks/base/core/java/android/provider/MediaStore.java
|
49ffc0ff72a29f000b56deb34b0706cbfc5624bf |
|
05-Feb-2010 |
Ray Chen <raychen@google.com> |
Revise ThumbnailUtils API.
/frameworks/base/core/java/android/provider/MediaStore.java
|
bf124e7e41f7850ac1b7be808221a462db6f3447 |
|
26-Jan-2010 |
Ray Chen <raychen@google.com> |
Unhide ThumbnailUtils to support Camera unbundling. http://b/2375978
/frameworks/base/core/java/android/provider/MediaStore.java
|
624d39dd818037d4c2f1b0ab846b0ba336a7e767 |
|
07-Jan-2010 |
Chih-Chung Chang <chihchung@google.com> |
Unhide intent extra constants for Camera.
/frameworks/base/core/java/android/provider/MediaStore.java
|
592632562a2c5c01c016c893b0d2d2a16d9081b6 |
|
05-Jan-2010 |
Marco Nelissen <marcone@google.com> |
Unhide some MediaStore things that should be public.
/frameworks/base/core/java/android/provider/MediaStore.java
|
9a488b44cb479bc42375d2cfcdd4aa6161dc17cf |
|
05-Jan-2010 |
Marco Nelissen <marcone@google.com> |
MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING
/frameworks/base/core/java/android/provider/MediaStore.java
|
ed297a8417b1a44cf94ba0e33175a87055088424 |
|
04-Jan-2010 |
Marco Nelissen <marcone@google.com> |
Add the UNKNOWN_STRING definition to MediaStore. It will be removed from MediaFile once I've updated the code that uses it.
/frameworks/base/core/java/android/provider/MediaStore.java
|
e3d05fcf396fd0e48a0741df4ddb77533fe934b3 |
|
10-Dec-2009 |
Marco Nelissen <marcone@google.com> |
cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2 Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp * commit '7cd4029473431c56100e52f631b9733829dc3171': Add convenience function to MediaStore to move a playlist item
/frameworks/base/core/java/android/provider/MediaStore.java
|
f9a243d4a8052ddaec611852d4877ba6262373f4 |
|
30-Oct-2009 |
Ray Chen <raychen@google.com> |
Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary.
/frameworks/base/core/java/android/provider/MediaStore.java
|
13ed5750ba515c3b4345937c7a11667a90cb1265 |
|
05-Oct-2009 |
Ray Chen <raychen@google.com> |
Add group id to getThumbnail and cancelThumbnailRequest API.
/frameworks/base/core/java/android/provider/MediaStore.java
|
9b150b74573ce506abd00c692fb42f46980441a3 |
|
01-Oct-2009 |
Marco Nelissen <marcone@google.com> |
Close the cursor before assigning a new one to the same variable.
/frameworks/base/core/java/android/provider/MediaStore.java
|
ef093cd6c4ab4d3c8a1c8be5ed7147d5f06d7027 |
|
30-Sep-2009 |
Ray Chen <raychen@google.com> |
Fix issue 2152541 thumbnail images stretched.
/frameworks/base/core/java/android/provider/MediaStore.java
|
b994419263fb4f595379838f62efc50f90565e20 |
|
30-Sep-2009 |
Ray Chen <raychen@google.com> |
Add cancelThumbnailRequest to thumbnail API.
/frameworks/base/core/java/android/provider/MediaStore.java
|
00c575a3fccb9d3065e913f1b8fcf93e18d44eaf |
|
28-Aug-2009 |
Ray Chen <raychen@google.com> |
Add new thumbnail API.
/frameworks/base/core/java/android/provider/MediaStore.java
|
eb0098d8e89033b78017a9e0068e3ac7ca51c112 |
|
24-Aug-2009 |
Chih-Chung Chang <chihchung@google.com> |
Add an extra intent parameter for recording duration limit.
/frameworks/base/core/java/android/provider/MediaStore.java
|
816cf52abd8f45770f0ac922bbb819184ed4b90f |
|
06-Jul-2009 |
Marco Nelissen <marcone@google.com> |
Fix the DEFAULT_SORT_ORDER value for media files. Changing this is OK, because existing app will have the old value compiled in as a literal, and so will continue to (not) work in the same way as before. Add code to media key generator to give a leading ascii \001 the special meaning of "sort first".
/frameworks/base/core/java/android/provider/MediaStore.java
|
2f189fa0f75d6899b9fa7db11f5301bc7850b744 |
|
30-Jun-2009 |
Marco Nelissen <marcone@google.com> |
Fix http://code.google.com/p/android/issues/detail?id=3059
/frameworks/base/core/java/android/provider/MediaStore.java
|
e754e128e6237ea1c5b263ec2a02b0413851cfba |
|
22-May-2009 |
Marco Nelissen <marcone@google.com> |
Change the media key algorithm to also ignore double quotes.
/frameworks/base/core/java/android/provider/MediaStore.java
|
f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 |
|
11-Apr-2009 |
Andy Stadler <> |
AI 145778: Manual merge changes 145382-145384 from cupcake. Automated import of CL 145778
/frameworks/base/core/java/android/provider/MediaStore.java
|
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/provider/MediaStore.java
|
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/provider/MediaStore.java
|
15ab3eae2ec3d73b3e8aa60b33ae41445bf83f4b |
|
20-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132569
/frameworks/base/core/java/android/provider/MediaStore.java
|
d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/core/java/android/provider/MediaStore.java
|
f1e484acb594a726fb57ad0ae4cfe902c7f35858 |
|
22-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@127436
/frameworks/base/core/java/android/provider/MediaStore.java
|
9266c558bf1d21ff647525ff99f7dadbca417309 |
|
16-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@126645
/frameworks/base/core/java/android/provider/MediaStore.java
|
b798689749c64baba81f02e10cf2157c747d6b46 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/frameworks/base/core/java/android/provider/MediaStore.java
|
f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/java/android/provider/MediaStore.java
|
54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/java/android/provider/MediaStore.java
|