summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge "MTP: Support format argument in host GetObjectPropDesc command"Mike Lockwood2010-12-072-3/+4
|\
| * MTP: Support format argument in host GetObjectPropDesc commandMike Lockwood2010-12-072-3/+4
| | | | | | | | | | Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "MTP: Read property code before calling isDeviceProperty in ↵Mike Lockwood2010-12-071-2/+1
|\ \ | |/ | | | | MtpProperty::read()"
| * 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>
* | Merge "MTP: Improve MtpProperty logging support"Mike Lockwood2010-12-074-8/+130
|\ \ | |/
| * MTP: Improve MtpProperty logging supportMike Lockwood2010-12-074-8/+130
| | | | | | | | | | Change-Id: I46800b99763edcc5e994d912941f9f5e9b1c94d2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc"Mike Lockwood2010-12-072-0/+38
|\ \ | |/
| * MTP: Host support for GetObjectPropsSupported and GetObjectPropDescMike Lockwood2010-12-072-0/+38
| | | | | | | | | | Change-Id: I6fd23587597fc68227dfb61118b097eda3e3e1d5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "MTP: Use correct return type for getSupportedObjectProperties"Mike Lockwood2010-12-071-1/+1
|\ \ | |/
| * MTP: Use correct return type for getSupportedObjectPropertiesMike Lockwood2010-12-071-1/+1
| | | | | | | | | | Change-Id: I6d5bd63fecaa3384dfa1b97dbc0d89ea5668981f Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Revert "MTP: Remove static library build for linux host.""Mike Lockwood2010-12-071-0/+29
|\ \ | |/
| * Revert "MTP: Remove static library build for linux host."Mike Lockwood2010-12-071-0/+29
| | | | | | | | | | | | This reverts commit d46c683f0e13ad9341ba83453835f6658ae5ad15. Change-Id: I7e56760c92bad1d66d4a1f2415328a4d2138de84
* | Merge "Don't drop video frames but to release them."James Dong2010-12-071-1/+4
|\ \
| * | Don't drop video frames but to release them.James Dong2010-12-061-1/+4
| |/ | | | | | | | | | | bug - 3259009 Change-Id: Ib7634f10a7fe7b7ce7014b79b07957d194bae1a7
* | Merge "API Support for both synchronous and queued commands, optionally ↵Andreas Huber2010-12-078-65/+256
|\ \ | |/ |/| | | associated metadata."
| * API Support for both synchronous and queued commands, optionally associated ↵Andreas Huber2010-12-068-65/+256
| | | | | | | | | | | | metadata. Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
* | am 23b791cd: am d57fbe88: Fixed a race condition where some recording frames ↵James Dong2010-12-060-0/+0
|\ \ | | | | | | | | | | | | | | | | | | may not be released * commit '23b791cd0f725d188b84dabfd9eeab4e3775b869': Fixed a race condition where some recording frames may not be released
| * \ am d57fbe88: Fixed a race condition where some recording frames may not be ↵James Dong2010-12-061-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | released * commit 'd57fbe887fabd027e644caeaa2139c863143a786': Fixed a race condition where some recording frames may not be released
| | * | Fixed a race condition where some recording frames may not be releasedJames Dong2010-12-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3258924 Change-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b
* | | | Merge "Remove check if the target video resolution is not supported by ↵James Dong2010-12-063-18/+27
|\ \ \ \ | |_|_|/ |/| | | | | | | CameraSource and clean up Camera is CameraSource could not created."
| * | | Remove check if the target video resolution is not supported by CameraSourceJames Dong2010-12-053-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and clean up Camera is CameraSource could not created. bug - 3254411 Change-Id: I43497c450e7007de5ce027e2912b1421119e8887
* | | | Squashed commit of the following:Andreas Huber2010-12-0616-840/+1043
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 15:26:12 2010 -0800 Remove obsolete code from the cached data source. Change-Id: I794b986ac8977cbc834dff189221a636ba564e36 commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 15:23:13 2010 -0800 LiveSource is dead, long live LiveSession. Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66 commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 12:49:31 2010 -0800 Respect explicitly signalled discontinuities. Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271 commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 11:45:57 2010 -0800 Better protection against syncword emulation in AAC ADTS content. Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719 commit fe765766582efcc350aed01135ea603576adccf6 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 09:15:59 2010 -0800 New implementation of http live driving code. Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737 Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
* | | Prepare for publishing MediaMetadataRetriever as public APIJames Dong2010-12-0310-77/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | step one: o replaced captureFrame with getFrameAtTime o removed getMode bug - 2433195 Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
* | | If camera source uses the metadata, we must use HW encoderJames Dong2010-12-023-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera bug - 3242213 Change-Id: I97361ed88b2a687190e5129459011afff7f32c2d
* | | Merge "Squashed commit of the following:"Andreas Huber2010-12-026-14/+80
|\ \ \
| * | | Squashed commit of the following:Andreas Huber2010-12-026-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit de99ae4a523ff5ec40b47071f22fdde1a4b2a0bf Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:18:40 2010 -0800 Scan for sync words to find H.264 frame/AAC frame boundaries if PES packets do not start with them. Change-Id: If2861982ecb3006fac806105dbfcd1d43c2a4205 commit be23791ff0d037aa7073589cdc8bfc362e1c281d Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:12:39 2010 -0800 Properly expand relative key URLs and strip surrounding quotes in the M3UParser. Change-Id: I013a6d83a64f095d090e5c7730298bdac7d03ab4 commit 0f1d8f65effe0cc42a265dd91d8b91dce6534325 Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:11:27 2010 -0800 Ugly hack that assumes that any http url containing "m3u8" refers to an httplive stream. Change-Id: I05d7bbc5dab0f9822558122b5b9dc2a109ed8518 commit 255f0d5cdb1072ecd66b47ee614bf574f1388e5a Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:10:56 2010 -0800 Add one more mimetype "application/x-mpegurl" to identify httplive playlists. Change-Id: I63fd3b8c2539c9ee23c077df533157af78b10863 Change-Id: I135687383009dbe32d690c9ba8dea60159adc616
* | | | am 80639875: am d4c5478a: Merge "Be conservative in estimating the file size ↵James Dong2010-12-022-1/+12
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | limit." into gingerbread * commit '806398755fdc63438b607856574e5b885ad98e6b': Be conservative in estimating the file size limit.
| * | am d4c5478a: Merge "Be conservative in estimating the file size limit." into ↵James Dong2010-12-022-1/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | gingerbread * commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74': Be conservative in estimating the file size limit.
| | * Merge "Be conservative in estimating the file size limit." into gingerbreadJames Dong2010-12-022-1/+12
| | |\
| | | * Be conservative in estimating the file size limit.James Dong2010-11-302-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3045580 Change-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797
* | | | am 5561ecff: am 077bc4ac: Merge from open-source masterJean-Baptiste Queru2010-12-020-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5561ecff7bdcb8a8f377d442ca64ee87ee1356b8': Fix HTTP redirect missing statuscode 303 and 307
| * | | am 077bc4ac: Merge from open-source masterJean-Baptiste Queru2010-12-020-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '077bc4ac019ad33abd613448e11d3ad501218991': Fix HTTP redirect missing statuscode 303 and 307
| | * \ \ Merge from open-source masterJean-Baptiste Queru2010-12-020-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
| | | * | | Fix HTTP redirect missing statuscode 303 and 307Per Osbäck2010-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c5f3a9f348a05d0558b31f912e10a59382eb24c
* | | | | | MTP: Add support for multiple properties in GetObjectPropList commandMike Lockwood2010-12-023-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib469a6c8141937aaa3e811345056195117abb4b2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am ed98a7c7: am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is ↵Eric Laurent2010-12-010-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependent on in call volume." into gingerbread * commit 'ed98a7c776e0a7a20390b3d51f8f7ab7d292a7d0': Fix issue 2641884: Bluetooth volume is dependent on in call volume.
| * | | | | am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in ↵Eric Laurent2010-12-011-13/+23
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | call volume." into gingerbread * commit '78d81851a8ef6691541215afb19e5bc690a4c3c0': Fix issue 2641884: Bluetooth volume is dependent on in call volume.
| | * | | | Fix issue 2641884: Bluetooth volume is dependent on in call volume.Eric Laurent2010-12-011-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream volume did not actually change. So even if we re apply volumes when switching to bluetooth device, the volume voice volume is not changed and remains what it was when routed to earpiece What makes things worse on Passion is that stream volumes are limited when connected to bluetooth and their actual value does not change as soon as they exceed the limit threshold. Change-Id: Id7c317db45b392a1c20dca2859678e3c64a371ed
* | | | | | resolved conflicts for merge of 0d28be68 to masterEric Laurent2010-12-011-50/+54
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Iec5f810c366d3e1c14a6f6294b0aea4ffb30ae3e
| * | | | | am e23212bc: Merge "Fix issue 3142808." into gingerbreadEric Laurent2010-12-011-49/+52
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8': Fix issue 3142808.
| | * | | | Fix issue 3142808.Eric Laurent2010-12-011-49/+52
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in the way audio policy manager handles A2DP interface suspend/restore when SCO is used. This bug is not new but has been triggered by a change in the timing of the events received by audio policy manager when a call is setup and torn down introduced by commit 164a8f86c7e48992691368c4895709c3bdb835a4. The fix consists in grouping the control of A2DP suspended state in a single function that is called systematically when conditions affecting this state are changed: - call state change - device connection/disconnection - change in forced usage. Change-Id: I46ee2399ee5547b60511fc6cfd32e2720091b0f8
* | | | | Merge "Add preferred preview size support in the camera framework"James Dong2010-12-012-0/+32
|\ \ \ \ \
| * | | | | Add preferred preview size support in the camera frameworkJames Dong2010-11-302-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 3237021 Change-Id: Ica8a3ae5cfbee462b74de98770e33277186c9a2b
* | | | | | am b460779c: (-s ours) am 30c81844: Merge "DO NOT MERGE Support for ↵Andreas Huber2010-12-010-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | "chunked" HTTP transfer encoding." into gingerbread * commit 'b460779cff97f2619e22911264350f5dbb7e76bc': DO NOT MERGE Support for "chunked" HTTP transfer encoding.
| * | | | | am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer ↵Andreas Huber2010-11-304-13/+142
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | encoding." into gingerbread * commit '30c818444d876dd868b84adec2416308c90f32e3': DO NOT MERGE Support for "chunked" HTTP transfer encoding.
| | * | | | Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into ↵Andreas Huber2010-11-304-13/+142
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | DO NOT MERGE Support for "chunked" HTTP transfer encoding.Andreas Huber2010-11-304-13/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Change-Id: I253d48ea69f239a6d3d0bb7e0d31eef5c773a9d6 related-to-bug: 3205131
* | | | | | | am 9157478d: (-s ours) am a41c1e1d: Merge "DO NOT MERGE Upgrade to the ↵Andreas Huber2010-12-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | latest version of libwebm to fix YouTube webm playback." into gingerbread * commit '9157478dcfb624a57e2ee83fb3cffd0bb2f72685': DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
| * | | | | | am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to ↵Andreas Huber2010-11-303-3533/+5067
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix YouTube webm playback." into gingerbread * commit 'a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb': DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.