summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Added new bitrate values"Shyam Pallapothu2010-11-241-0/+3
|\
| * Added new bitrate valuesGil Dobjanschi2010-11-241-0/+3
| | | | | | | | Change-Id: I2e6ab51d9a845beca02f84cefc66663fbf89aabf
* | Rename MtpClient and MtpCursor to PtpClient and PtpCursorMike Lockwood2010-11-232-14/+14
| | | | | | | | | | Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Rename android.provider.Mtp to android.provider.PtpMike Lockwood2010-11-232-33/+33
|/ | | | | | | | | | | 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>
* Merge "Begin transition was invalidated when the image duration was changed."Gil Dobjanschi2010-11-221-13/+22
|\
| * Begin transition was invalidated when the image duration was changed.Gil Dobjanschi2010-11-221-13/+22
| | | | | | | | Change-Id: I0118813a66c65d8b3746fc2c689cf9d8da651aa3
* | Unhide android.media.AudioManager.MODE_IN_COMMUNICATIONJean-Michel Trivi2010-11-221-3/+4
| | | | | | | | | | | | | | | | | | Unhide new constant for an audio mode for a system state when the device has a VoIP (as opposed to telephony) call established. Update the setMode and getMode javadoc to link to the mode constants that can be set or retrieved. Change-Id: I90c4417679f215eb66e5305086fd077beddaa59c
* | PTP: Improve performance and reliability of file importingMike Lockwood2010-11-192-5/+6
|/ | | | | | | | | | | | | | | | Now the file copy is done completely within the media process rather than pushing data to the client via ContProvider.openFile(). File system writes are now interleaved with USB reads, which allows us to copy the data faster and prevents the camera from timing out during transfer. File is automatically inserted in the media provider after a successful import and a Uri is returned to the client. BUG: 2994234 Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972 Signed-off-by: Mike Lockwood <lockwood@android.com>
* AudioTrack getTimelineDuration clarification.Gil Dobjanschi2010-11-181-10/+3
| | | | Change-Id: I276316e851918df227b7246766916fa8572f1b89
* Added IOException to WaveformData constructorGil Dobjanschi2010-11-184-3/+11
| | | | Change-Id: Ic00b582beaa2701ffa72e99194693fd7cfa45a6d
* Merge "Disable ducking by default. Changed ducking threshold parameter range."Gil Dobjanschi2010-11-171-4/+5
|\
| * Disable ducking by default. Changed ducking threshold parameter range.Gil Dobjanschi2010-11-171-4/+5
| | | | | | | | Change-Id: I66a73b270466ced2ace9e3b10f82cfab1a1306bb
* | Fix bug 3183484 unhide MediaRecorder.AudioSource.VOICE_COMMUNICATIONJean-Michel Trivi2010-11-171-6/+4
| | | | | | | | Change-Id: I26cd88b1bb05de546415b1f92fbb9430e63b4eab
* | MTP: Fixes to allow file transfers > 4 gigabytesMike Lockwood2010-11-171-1/+13
|/ | | | | | | BUG: 3198248 Change-Id: I6f11c79a19d7bdd63718a7370939124b1262d221 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Merge "MTP: Set correct format for abstract audio playlists"Mike Lockwood2010-11-171-0/+1
|\
| * MTP: Set correct format for abstract audio playlistsMike Lockwood2010-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes a bad interaction with the media scanner that could result in playlists getting duplicated or deleted after rebooting. BUG: 3175649 Change-Id: I970234e86b24ac17d069aca085683d988abc7881 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Add new audio mode for audio communications other than telelphony."Jean-Michel Trivi2010-11-173-5/+12
|\ \ | |/ |/|
| * Add new audio mode for audio communications other than telelphony.Jean-Michel Trivi2010-11-163-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio mode MODE_IN_CALL signals the system the device a phone call is currently underway. There was no way for audio video chat or VoIP applications to signal a call is underway, but not using the telephony resources. This change introduces a new mode to address this. Changes in other parts of the system (java and native) are required to take this new mode into account. The generic AudioPolicyManager is updated to not use its phone state variable directly, but to use two new convenience methods, isInCall() and isStateInCall(int) instead. Change-Id: Id744cd26520ea1d1a4795eabe6a1f0c58789af76
* | Merge "Invalidate transitions when the start time or duration of an effect ↵Gil Dobjanschi2010-11-166-14/+131
|\ \ | | | | | | | | | or overlay changes."
| * | Invalidate transitions when the start time or duration of an effect or ↵Gil Dobjanschi2010-11-166-14/+131
| | | | | | | | | | | | | | | | | | overlay changes. Change-Id: Ibc4d80e92ff46b4ecabed5b998f5b0f2c9ca3473
* | | MediaScanner: Always use mime type provided to the media scannerMike Lockwood2010-11-161-6/+5
| |/ |/| | | | | | | | | | | BUG: 3179926 Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "MTP: Fix time values returned via GetObjectPropValue and ↵Mike Lockwood2010-11-151-10/+2
|\ \ | | | | | | | | | GetObjectPropList"
| * | MTP: Fix time values returned via GetObjectPropValue and GetObjectPropListMike Lockwood2010-11-151-10/+2
| | | | | | | | | | | | | | | Change-Id: If9bb8b4b19ed6c8d57736e5d1af948fcc946af0e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "Add http live mime types to MediaFile, add support for playlist mime ↵Andreas Huber2010-11-151-4/+9
|\ \ \ | |/ / |/| | | | | types to browser."
| * | Add http live mime types to MediaFile, add support for playlist mime types ↵Andreas Huber2010-11-151-4/+9
| |/ | | | | | | | | | | | | to browser. Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f related-to-bug: 2368598
* | MTP: Partial implementation of the GetObjectPropList commandMike Lockwood2010-11-153-139/+355
| | | | | | | | | | | | | | | | | | | | In this initial implementation we only support fetching one property at a time. Support depth = 0 (single object) or depth = 1 (all objects in a directory) Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former is a special case of the latter. Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | Merge "MediaScanner: Add support for importing file based playlists copied ↵Mike Lockwood2010-11-151-61/+83
|\ \ | |/ |/| | | over MTP"
| * MediaScanner: Add support for importing file based playlists copied over MTPMike Lockwood2010-11-121-61/+83
| | | | | | | | | | Change-Id: I53a9f204297ff29d4df994d2174bd6d6288f2c97 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Transition invalidation bug fix.Gil Dobjanschi2010-11-121-47/+96
|/ | | | Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
* Merge "Invalidate transitions when an image media item duration changes."Gil Dobjanschi2010-11-112-60/+111
|\
| * Invalidate transitions when an image media item duration changes.Gil Dobjanschi2010-11-112-60/+111
| | | | | | | | Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
* | Merge "MediaFile: Recognize MPG file extension as MPEG video"Mike Lockwood2010-11-111-0/+1
|\ \ | |/ |/|
| * MediaFile: Recognize MPG file extension as MPEG videoMike Lockwood2010-11-111-0/+1
| | | | | | | | | | Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Close the file input stream if the XML file parsing fails.Gil Dobjanschi2010-11-101-101/+106
|/ | | | Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
* Add recording source for voice communicationJean-Michel Trivi2010-11-091-1/+10
| | | | | | | Add a recording source used to designate a recording stream for voice communications such as VoIP. Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
* Use back-facing camera as default in camera/camcorder profile.Wu-cheng Li2010-11-092-8/+40
| | | | | bug:3173302 Change-Id: Iae9565eb58949a1c9c2f2a1f5251b2df097ec167
* am 9cebb86c: am 1b2efbca: Merge "Update a comment about when ↵James Dong2010-11-081-1/+1
|\ | | | | | | | | | | | | setOrientationHint() should be called" into gingerbread * commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b': Update a comment about when setOrientationHint() should be called
| * am 1b2efbca: Merge "Update a comment about when setOrientationHint() should ↵James Dong2010-11-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | be called" into gingerbread * commit '1b2efbca7120cf799d1242d277af354df7b0a9bb': Update a comment about when setOrientationHint() should be called
| | * Update a comment about when setOrientationHint() should be calledJames Dong2010-11-081-1/+1
| | | | | | | | | | | | Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
* | | Merge "Fix invalidateTransition method"Gil Dobjanschi2010-11-087-48/+56
|\ \ \
| * | | Fix invalidateTransition methodGil Dobjanschi2010-11-087-48/+56
| | | | | | | | | | | | | | | | Change-Id: I12d5b7256d2956007b65c8304053717dd7b9b7ef
* | | | Merge "Move the volume, media, call, camera and search key handling from ↵Joe Onorato2010-11-081-0/+68
|\ \ \ \ | |/ / / |/| | | | | | | PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors."
| * | | Move the volume, media, call, camera and search key handling fromJoe Onorato2010-11-051-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors. Bug: 3155146 Change-Id: Ib070fa3e523e3564b225bca576c08012fef4f416
* | | | Do not use CAMERA_ID_DEFAULT because it is removed.Wu-cheng Li2010-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | bug:3173302 Change-Id: I360e55f2665b2e121c8cf017e17c4cb4dd181e88
* | | | am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording ↵James Dong2010-11-061-0/+25
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | rotated videos" into gingerbread * commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3': Add a new public API to support recording rotated videos
| * | | am 0467b0ab: Merge "Add a new public API to support recording rotated ↵James Dong2010-11-061-0/+25
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | videos" into gingerbread * commit '0467b0abfc94f959163d84eadedf6941e41c1882': Add a new public API to support recording rotated videos
| | * | Add a new public API to support recording rotated videosJames Dong2010-11-051-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | o changed a comment about the rotation orientation from counter-clockwise to clockwise. Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
| * | | am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into ↵James Dong2010-11-031-12/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b': Revert "Support rotation in media recorder"
| | * | Revert "Support rotation in media recorder"James Dong2010-11-031-12/+0
| | | | | | | | | | | | | | | | This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
| * | | am c181a082: Merge "Support rotation in media recorder" into gingerbreadHiroshi Lockheimer2010-11-031-0/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'c181a08209dc85c80e4da5d20cd3980998def40d': Support rotation in media recorder