summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
|\ | | | | | | | | * commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75': Improve Javadoc for USB Manager and MTP/PTP support.
| * Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
| | | | | | | | | | | | | | Bug: 4091519 Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
|\ \ | |/ | | | | | | * commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894': Bug 4167061
| * Bug 4167061Glenn Kasten2011-03-301-1/+1
| | | | | | | | Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
* | am b676b73e: Merge "When http streaming and Content-Length is unknown, make ↵Andreas Huber2011-03-301-1/+8
|\ \ | |/ | | | | | | | | | | sure to return all" into honeycomb-mr1 * commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b': When http streaming and Content-Length is unknown, make sure to return all
| * Merge "When http streaming and Content-Length is unknown, make sure to ↵Andreas Huber2011-03-301-1/+8
| |\ | | | | | | | | | return all" into honeycomb-mr1
| | * When http streaming and Content-Length is unknown, make sure to return allAndreas Huber2011-03-301-1/+8
| | | | | | | | | | | | | | | | | | | | | data that we successfully received before signalling the error. Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce related-to-bug: 4190765
* | | am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified ↵Andreas Huber2011-03-302-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | right/bottom edge exclusive." into honeycomb-mr1 * commit 'ebf6a72b3536646ade389c7afa828e316eb93c21': Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
| * | Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.Andreas Huber2011-03-292-4/+4
| |/ | | | | | | | | Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e related-to-bug: 4147205
* | am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time ↵Andreas Huber2011-03-281-0/+5
|\ \ | |/ | | | | | | | | | | isn\'t reestablished." into honeycomb-mr1 * commit '2edbdcc6f2572e5f84253617b1850908344b3f8c': After a seek there's a brief period where audio time isn't reestablished.
| * Merge "After a seek there's a brief period where audio time isn't ↵Andreas Huber2011-03-281-0/+5
| |\ | | | | | | | | | reestablished." into honeycomb-mr1
| | * After a seek there's a brief period where audio time isn't reestablished.Andreas Huber2011-03-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Don't use audio time to trigger a "we're very late, skipping ahead" action until it's reestablished. Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1 related-to-bug: 4173683
* | | am 1457ef74: Merge "Make sure we post a video event when seeking after ↵Andreas Huber2011-03-251-2/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | seeing video EOS before." into honeycomb-mr1 * commit '1457ef74d49ee56097ad97cc078e898326beb7db': Make sure we post a video event when seeking after seeing video EOS before.
| * | Make sure we post a video event when seeking after seeing video EOS before.Andreas Huber2011-03-251-2/+17
| |/ | | | | | | | | Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba related-to-bug: 3316960
* | am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1James Dong2011-03-251-6/+1
|\ \ | |/ | | | | | | * commit '837430dd3440f6e71f68ef755399e22386dee084': Switch to use SF cached source
| * Switch to use SF cached sourceJames Dong2011-03-251-6/+1
| | | | | | | | | | | | bug - 3500025 Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
* | am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1Glenn Kasten2011-03-231-0/+37
|\ \ | |/ | | | | | | * commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4': Bug 4159373 Use HDCP debug settings
| * Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1Glenn Kasten2011-03-231-0/+37
| |\
| | * Bug 4159373 Use HDCP debug settingsGlenn Kasten2011-03-231-0/+37
| | | | | | | | | | | | Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
* | | am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1shailendra2011-03-231-14/+18
|\ \ \ | |/ / | | | | | | | | | * commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78': Fix for Media Server memory leak
| * | Merge "Fix for Media Server memory leak" into honeycomb-mr1shailendra2011-03-231-14/+18
| |\ \ | | |/ | |/|
| | * Fix for Media Server memory leakshailendra2011-03-221-14/+18
| | | | | | | | | | | | | | | | | | bug - 4081123 Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
* | | am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build ↵shailendra2011-03-221-4/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | HMI75B(4128259)" into honeycomb-mr1 * commit '8483073ec21b5e2332deaad914eba1d087b1d1e3': Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
| * | Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" ↵shailendra2011-03-221-4/+11
| |\ \ | | |/ | |/| | | | into honeycomb-mr1
| | * Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)shailendra2011-03-181-4/+11
| | | | | | | | | | | | Change-Id: I0a7081f901684ff7c7388b830afc6ae2f2ce7bcd
* | | am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// ↵Andreas Huber2011-03-222-3/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | urls, fix a parsing issue." into honeycomb-mr1 * commit '453c0d5f16a09473b0653566973bf8b6a867cf79': DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
| * | Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a ↵Andreas Huber2011-03-222-3/+27
| |\ \ | | | | | | | | | | | | parsing issue." into honeycomb-mr1
| | * | DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.Andreas Huber2011-03-212-3/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4 related-to-bug: 4148291
* | | | am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" ↵Yu Shan Emily Lau2011-03-211-67/+68
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1 * commit '0210997218fc22b77c71a43a2396419cd0a39166': Add the mem logging into test utility. Bug# 4108259
| * | | Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1Yu Shan Emily Lau2011-03-211-67/+68
| |\ \ \ | | |/ / | |/| |
| | * | Add the mem logging into test utility.Yu Shan Emily Lau2011-03-181-67/+68
| | | | | | | | | | | | | | | | | | | | | | | | Bug# 4108259 Change-Id: Ifc8091490beef1430a1a0ab297e514b605da56f6
* | | | am e2c32e9f: If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b': If nothing is to be copied, return right away.
| * | | If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | This avoids a potential out-of-bounds problem in the code below. Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c related-to-bug: 4139974
* | | am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and ↵shailendra2011-03-182-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 * commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776': Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
| * | Merge "Fix for testThumbnailForInvalidFilePath and ↵shailendra2011-03-182-1/+5
| |\ \ | | | | | | | | | | | | testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
| | * | Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile ↵shailendra2011-03-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | failed with HMI75B(4124235) Change-Id: Iab523e666c11b7f99aac71c761a4295d32ca026c
* | | | am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media ↵James Dong2011-03-176-0/+95
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | framework files * commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3': Fix missing AOSP copyright headers for a bunch of media framework files
| * | | Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-176-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | bug - 4119349 Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
* | | | am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been ↵Mike Lockwood2011-03-171-2/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | started" into honeycomb-mr1 * commit '11473332b4df78610ebb903e255d69ab35e5bf59': MtpServer: Do not attempt to stop MTP if it has not been started
| * | | MtpServer: Do not attempt to stop MTP if it has not been startedMike Lockwood2011-03-171-2/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an ANR that occurred if we got a USB disconnected event before the MTP service had started. Bug: 4118033 Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which ↵Yu Shan Emily Lau2011-03-162-2/+110
|\ \ \ | |/ / | | | | | | | | | | | | | | | exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 * commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39': Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
| * | Merge "Suppress the 1 hour video editor export test case which exceed the 5 ↵Yu Shan Emily Lau2011-03-162-2/+110
| |\ \ | | |/ | | | | | | mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
| | * Suppress the 1 hour video editor export test case which exceed the 5 mins ↵Yu Shan Emily Lau2011-03-162-2/+110
| | | | | | | | | | | | | | | | | | | | | | | | large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
* | | am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report ↵Rajneesh Chowdury2011-03-162-0/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | (Java/Jni)" into honeycomb-mr1 * commit '0edefea88e975613bca9f0227614de91434ade11': Fix for 4087846 Crash reported by monkey report (Java/Jni)
| * | Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into ↵Rajneesh Chowdury2011-03-162-0/+24
| |\ \ | | | | | | | | | | | | honeycomb-mr1
| | * | Fix for 4087846 Crash reported by monkey report (Java/Jni)Rajneesh Chowdury2011-03-152-0/+24
| | | | | | | | | | | | | | | | Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
* | | | am fc591762: Merge "Add the default camera id to mCameraIds for emulator and ↵James Dong2011-03-161-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | those devices without media_profiles.xml configuration file." into honeycomb-mr1 * commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd': Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
| * | | Add the default camera id to mCameraIds for emulator and those devices ↵James Dong2011-03-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without media_profiles.xml configuration file. bug - 4109530 Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
* | | | am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an ↵Andreas Huber2011-03-161-12/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | audio-only stream and seeking before starting." into honeycomb-mr1 * commit '46956b0691b2a228237d17536fe4ad33a760c0af': DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
| * | | DO NOT MERGE: Fix a race condition when playing an audio-only stream and ↵Andreas Huber2011-03-161-12/+5
| | |/ | |/| | | | | | | | | | | | | | | | seeking before starting. Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7 related-to-bug: 4039068
generated by cgit v1.1 at 2024-10-30 10:58:50 +0000