summaryrefslogtreecommitdiffstats
path: root/media/mtp
Commit message (Collapse)AuthorAgeFilesLines
* am ed757e97: am 290ac693: Merge "Stop building the unused host libmtp static ↵Elliott Hughes2012-09-111-28/+0
|\ | | | | | | | | | | | | library." * commit 'ed757e9729b325f00e70f506ad6e217910563d0a': Stop building the unused host libmtp static library.
| * Stop building the unused host libmtp static library.Elliott Hughes2012-09-111-28/+0
| | | | | | | | | | | | | | | | This removes the need to support the bionic mktime_tz and localtime_tz extensions on glibc, which makes my life easier. Bug: 7012465 Change-Id: Ibfa187f2857dda7bd1536348e314a80abacb9d1e
* | Add mode when open(O_CREAT) is used.Nick Kralevich2012-06-262-2/+2
|/ | | | | | | | | | When creating a new file using open(..., O_CREAT), it is an error to fail to specify a creation mode. If a mode is not specified, a random stack provided value is used as the "mode". This will become a compile error in a future Android change. Change-Id: I36a3d67d294a915c1f79632a1b0ba45edd1214b1
* Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
| | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* media/mtp: Add missing LOCAL_C_INCLUDESDavid 'Digit' Turner2012-01-131-0/+3
| | | | | | | | | | | One of the source files here is including <cutils/tztime.h> which itself includes <bionic_time.h>, a private C library header used to define the strftime_tz() extension (which used to be declared in <time.h> but was moved there instead). Add a missing C include path to let our code compile as usual. Change-Id: I6aac2f1d3d15ad182679c81ff3f4febff74eb671
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-085-39/+39
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-042-13/+13
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-034-17/+17
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-021-4/+7
| | | | | | | | | storage Bug: 5527220 Change-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b Signed-off-by: Mike Lockwood <lockwood@google.com>
* MTP: Don't attempt to read more than 16K at a time from the MTP driverMike Lockwood2011-12-011-2/+4
| | | | | | | | This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5 Signed-off-by: Mike Lockwood <lockwood@google.com>
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-265-39/+39
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in sizeMike Lockwood2011-10-131-1/+6
| | | | | | | Bug: 5432487 Change-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Use a single packet for the data phaseMike Lockwood2011-07-173-80/+66
| | | | | | | | instead of sending 12 byte header in a separate packet. PTP on the Mac is much happier with this approach. Change-Id: I7d1ca498f6346afd88876d24332187b466fc469c Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Clean up MtpServer initialization and threading:Mike Lockwood2011-07-131-0/+2
| | | | | | | Move thread from native to Java code Remove the stop() method (the thread will exit on its own) Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
| | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file systemMike Lockwood2011-07-113-2/+14
| | | | | | | Bug: 4561836 Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Add support for PTP variant of GetDeviceInfo result.Mike Lockwood2011-06-212-4/+19
| | | | | Change-Id: I09f86fda768b7697665e401adb9516588859bf59 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Fix some problems with GetObjectHandles and GetNumObjects commandsMike Lockwood2011-06-171-6/+2
| | | | | | | | These calls did not correctly handle some variants of the arguments, which showed up when running in PTP mode. Change-Id: Iedbaefebfa39111c8bcaee7c6cc3820a65d6c98f Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Have GetStorageInfo command return correct storage type for removable ↵Mike Lockwood2011-05-162-4/+8
| | | | | | | storage Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-035-1/+34
| | | | | | | | | This allows the PC to access thumbnails in JPEG files over MTP/PTP Bug: 3219495 Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | | | | Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-035-8/+268
| | | | | | | | | | | | | | | | | | | | | | MTP does not support partial writes of files (the entire file must be transferred at once). This makes it impossible to implement a FUSE file system for MTP with acceptable performance. To fix this problem, this change adds extended MTP operations to allow partial writes to files: SendPartialObject - allows writing a subset of a file, or appending to the end of a file TruncateObject - allows changing the size of a file BeginEditObject - must be called before using SendPartialObject and TruncateObject EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject We also add GetPartialObject64, which is the same as GetPartialObject but has a 64 bit offset rather than 32. Change-Id: Id5365e1c4dc55a2d819c16c9db0a3ac2260f9309 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-034-8/+9
| | | | | | | | | | | | | | - 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: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
| | | | | | | Bug: 3509060 Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP host: Fix problems reading large data packetsMike Lockwood2011-03-121-3/+3
| | | | | | | | | Fixes problem reading large thumbnails via PTP Bug: 4065217 Change-Id: I643672512829c93ab0827091f39103dbb1918071 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Add support for dynamically adding and removing storage unitsMike Lockwood2011-02-225-25/+95
| | | | | | BUG: 3402847 Change-Id: I7da266061d949abcb6bb11c6faaa47b5e4a2a977
* MTP host: disable some test codeMike Lockwood2011-02-151-2/+6
| | | | | Change-Id: I2237ad88f73b03a2c324f17267c52cc42b8a0d5b Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP host: Use usb_device_bulk_transfer for synchronous transfersMike Lockwood2011-02-141-6/+7
| | | | | Change-Id: Icf42ea0e5a848cee1565da49713ee9ad0db9f1a6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Fix some memory leaks found in static analysisKenny Root2011-02-021-14/+40
| | | | Change-Id: Icd630009793c51acfaed45763ef50489ead40024
* MTP: Use ro.product.manufacturer system property value for MTP manufacturer nameMike Lockwood2011-01-311-2/+3
| | | | | | | | | Previously it was hard coded to "Google, Inc." BUG: 3405965 Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d Signed-off-by: Mike Lockwood <lockwood@android.com>
* Add support for synchronous bulk USB transfersMike Lockwood2011-01-271-5/+5
| | | | | Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21 Signed-off-by: Mike Lockwood <lockwood@android.com>
* am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date ↵Mike Lockwood2011-01-261-2/+4
|\ | | | | | | | | | | | | parsing and formatting code" into honeycomb * commit 'bd65c065b2dcb54dde563a8a21c9f92da947c7dd': MTP: Fix month off by one error in date parsing and formatting code
| * MTP: Fix month off by one error in date parsing and formatting codeMike Lockwood2011-01-261-2/+4
| | | | | | | | | | | | | | BUG: 3379100 Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "New APIs for MTP and PTP host support"Mike Lockwood2011-01-225-332/+223
|\ \ | |/ |/|
| * New APIs for MTP and PTP host supportMike Lockwood2011-01-225-332/+223
| | | | | | | | | | | | | | This replaces the previous ContentProvider based interface Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Remove MTP related log spamMike Lockwood2011-01-212-16/+16
|/ | | | | Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Fix problems with modification dates for folders and non-media filesMike Lockwood2011-01-182-10/+4
| | | | | | | | | Also removed an unnecessary parameter to MtpDatabase.endSendobject() BUG: 3352142 Change-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Remove support for obsolete PTP content providerMike Lockwood2011-01-063-541/+0
| | | | | | | This will be replaced by a new PTP host API in an upcoming commit. Change-Id: Ib914194e332b5c090cb8e34ed35bd691bc9f85d1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: changes to use new usb_request support in libusbhostMike Lockwood2011-01-0613-91/+127
| | | | | Change-Id: Ic091eab166a66efcde0395dcebbbc513f2322fca Signed-off-by: Mike Lockwood <lockwood@android.com>
* Change libusbhost and libmtp from static to shared librariesMike Lockwood2010-12-291-1/+3
| | | | | Change-Id: Iccc67db32400cdeb88aa33261c9e0cf73db992ca Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: check for replacing existing files via the database instead of the file ↵Mike Lockwood2010-12-131-4/+0
| | | | | | | system Change-Id: I283dab48f24d2836e48fab8e49764a9cdf13de55 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Add support for reserve storage setting to avoid low storage situations.Mike Lockwood2010-12-124-9/+16
| | | | | | | | | | | | | Set resource config_mtpReserveSpaceMegabytes to number of megabytes to reserve. If MTP has dedicated storage this value should be zero, but if MTP is sharing storage with the rest of the system, set this to a positive value to ensure that MTP activity does not result in the storage being too close to full. BUG: 3250924 Change-Id: I881c87240da268bad1ea1b99ad03673ab85ffdbf Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP host: Handle receiving a response packet instead of data packet.Mike Lockwood2010-12-094-3/+32
| | | | | | | This will happen if the device needs to report an error rather than returning the data. Change-Id: I477512b3676c2f0518a85a4135832ed4475fbc2d Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Improve argument checking in SendObjectInfoMike Lockwood2010-12-083-8/+21
| | | | | | | | In particular, make sure the parent is a folder and make sure file does not already exist. Change-Id: Ifa870faba3285f03a92025d9e82f93fed78a761c Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Support format argument in host GetObjectPropDesc commandMike Lockwood2010-12-072-3/+4
| | | | | Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Read property code before calling isDeviceProperty in MtpProperty::read()Mike Lockwood2010-12-071-2/+1
| | | | | Change-Id: I0b1493f3af5d9caac08327f9ffba91ee255d3d55 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Improve MtpProperty logging supportMike Lockwood2010-12-074-8/+130
| | | | | Change-Id: I46800b99763edcc5e994d912941f9f5e9b1c94d2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Host support for GetObjectPropsSupported and GetObjectPropDescMike Lockwood2010-12-072-0/+38
| | | | | Change-Id: I6fd23587597fc68227dfb61118b097eda3e3e1d5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP: Use correct return type for getSupportedObjectPropertiesMike Lockwood2010-12-071-1/+1
| | | | | Change-Id: I6d5bd63fecaa3384dfa1b97dbc0d89ea5668981f Signed-off-by: Mike Lockwood <lockwood@android.com>
* Revert "MTP: Remove static library build for linux host."Mike Lockwood2010-12-071-0/+29
| | | | | | This reverts commit d46c683f0e13ad9341ba83453835f6658ae5ad15. Change-Id: I7e56760c92bad1d66d4a1f2415328a4d2138de84