summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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.
| | * | | | | Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube ↵Andreas Huber2010-11-303-3533/+5067
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | webm playback." into gingerbread
| | | * | | | DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm ↵Andreas Huber2010-11-303-3533/+5067
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback. DO NOT MERGE related-to-bug: 3141937 Change-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b
* | | | | | | am aeaa3b3c: am 567b2bd1: Merge "After seeking display the first new video ↵Andreas Huber2010-12-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread * commit 'aeaa3b3c6ad004b9a13fc9d48c924c77042e8c22': After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
| * | | | | | am 567b2bd1: Merge "After seeking display the first new video frame right ↵Andreas Huber2010-11-301-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | away without concern for A/V sync. This looks much more responsive to the user." into gingerbread * commit '567b2bd1469b1c37e6249637d313253b7d84971e': After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
| | * | | | | After seeking display the first new video frame right away without concern ↵Andreas Huber2010-11-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for A/V sync. This looks much more responsive to the user. Change-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5 related-to-bug: 3152363
* | | | | | | am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of ↵Andreas Huber2010-12-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread * commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55': DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
| * | | | | | am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface ↵Andreas Huber2010-11-305-57/+120
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | successfully registered buffers, report an error and propagate it up to the java client." into gingerbread * commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5': DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
| | * | | | | DO NOT MERGE - Instead of asserting that ISurface successfully registered ↵Andreas Huber2010-11-305-57/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers, report an error and propagate it up to the java client. Change-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd related-to-bug: 3188835
* | | | | | | am 4f93f08d: am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit ↵Chia-chi Yeh2010-11-301-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | sample to 16-bit sample." into gingerbread * commit '4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2': Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
| * | | | | am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to ↵Chia-chi Yeh2010-11-301-4/+4
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | | | | | | 16-bit sample." into gingerbread * commit '683a7ff922409d2aa6c944bc4e08de32029e80e5': Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
| | * | | Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." ↵Chia-chi Yeh2010-11-291-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.Chia-chi Yeh2010-11-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
* | | | | | Merge "MTP: Make sure buffer is big enough before reading the data packet"Mike Lockwood2010-11-301-0/+1
|\ \ \ \ \ \
| * | | | | | MTP: Make sure buffer is big enough before reading the data packetMike Lockwood2010-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes buffer overflow when transferring large playlists. Change-Id: I1b7feaf9e56d849e5b6609f0f68a6aa5a3ae1ea8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "Revert "Temporary workaround for issue 3187563""Eric Laurent2010-11-291-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "Temporary workaround for issue 3187563"Eric Laurent2010-11-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 065299b58d1c00cd24e442fa192561decf7b1fec. The work around for issue 3187563 is not needed any more since the new kernel DMA driver implementation (commit 7953250be7c9a1c3417e21b20032b571d495d218) fixes the root cause. Change-Id: Ibaac2826b63c8e5825ae2e5cab2fb2f0e51ab7b4
* | | | | | | | Remove empty Widevine make filesGloria Wang2010-11-241-27/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
* | | | | | | Fix issue 3225810.Eric Laurent2010-11-242-34/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take a wake lock whenever A2DP output stream is active. Change-Id: Ie50e6d4cb34c8a1ba97b301ef25e10aeb153d8f3
* | | | | | | Merge "Support streaming data across binder boundaries."Andreas Huber2010-11-2414-4/+760
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Support streaming data across binder boundaries.Andreas Huber2010-11-2314-4/+760
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
* | | | | | | Merge changes Ia5fec45a,I74927f73,I5a3c0b07Mike Lockwood2010-11-235-4/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: MTP: Fix typo in MtpServer::doGetObjectPropList MTP: Implement GetPartialObject command MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
| * | | | | | | MTP: Fix typo in MtpServer::doGetObjectPropListMike Lockwood2010-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5fec45a238c49a6797a4ac55457ddb5d6521408 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | | MTP: Implement GetPartialObject commandMike Lockwood2010-11-233-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows host to read partial contents of files on the device Change-Id: I74927f7394224d674e1d150a4b72a51d9358459b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | | MTP: Use DateTime form in GetObjectPropDesc for date/time properties.Mike Lockwood2010-11-232-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a3c0b07a9f2958b86947256606e6a824dbe93a6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "Do not getConfig on video encoder on output port"James Dong2010-11-231-26/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not getConfig on video encoder on output portJames Dong2010-11-231-26/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Id53e01dd8f3ec0c9ca94bb1d6dfccd7696254a2d