summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
|\ | | | | | | | | * commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4': Bug 4167061 remove debugging code
| * am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| |\ | | | | | | | | | | | | * commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc': Bug 4167061 remove debugging code
| | * Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| | | | | | | | | | | | Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
* | | am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0': Enable HDCP debugging in Stagefright (1 of 2)
| * | am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee': Enable HDCP debugging in Stagefright (1 of 2)
| | * Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
| | | | | | | | | | | | Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
* | | am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
|\ \ \ | |/ / | | | | | | | | | * commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f': Stagefright: authenticate ANativeWindow.
| * | am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
| |\ \ | | |/ | | | | | | | | | * commit '66380f768c0de8bde1f54ac6ab3f126b66928dad': Stagefright: authenticate ANativeWindow.
| | * Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a check to verify that the ANativeWindow to which decoded video buffers are queued sends those buffers to SurfaceFlinger. The check is done when the buffer content is flagged as protected. This change also adds an error in the case where protected buffers are needed, but an ANativeWindow is not being used as the video destination. Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b Bug: 4269240
* | | am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
|\ \ \ | |/ / | | | | | | | | | * commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2': Improve Javadoc for USB Manager and MTP/PTP support.
| * | 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 4ed59de6: am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '4ed59de640e46e42b5af3d79448be9da6e79667d': Bug 4167061
| * | am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894': Bug 4167061
| | * Bug 4167061Glenn Kasten2011-03-301-1/+1
| | | | | | | | | | | | Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
* | | am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is ↵Andreas Huber2011-03-301-1/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | unknown, make sure to return all" into honeycomb-mr1 * commit '06ac039962c7f15938afc4bbb74c2f14de4dc505': When http streaming and Content-Length is unknown, make sure to return all
| * | 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 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be ↵Andreas Huber2011-03-302-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | specified right/bottom edge exclusive." into honeycomb-mr1 * commit '8de5df439244e77d7892deceb86520551ff0499c': Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
| * | | 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 b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding ↵Brad Fitzpatrick2011-03-301-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | images in ThumbnailUtils" * commit 'b618b2ef8722964730d09a86a06a85ca34df6de4': Handle OutOfMemoryError when decoding images in ThumbnailUtils
| * | am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ↵Brad Fitzpatrick2011-03-281-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | ThumbnailUtils" * commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54': Handle OutOfMemoryError when decoding images in ThumbnailUtils
| | * | Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added handling of OutOfMemoryError handling to createImageThumbnail method in ThumbnailUtils.java. During mediascanner run it would run out of memory when trying to decode very large images. Now it handles this error and returns null which is handled by the media scanner. Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
* | | | 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)