Glenn Kasten
a7e8385cb3
am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:46:38 -07:00
Glenn Kasten
87ee132ac5
am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:43:28 -07:00
Glenn Kasten
c6c2285b36
Enable HDCP debugging in Stagefright (1 of 2)
...
Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
2011-04-11 11:07:53 -07:00
Jamie Gennis
0fb4e73f5f
am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:41:38 -07:00
Jamie Gennis
3a9f5143ef
am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:40:00 -07:00
Jamie Gennis
66380f768c
Stagefright: authenticate ANativeWindow.
...
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
2011-04-08 15:24:10 -07:00
Mike Lockwood
1c56976a77
am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
...
* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:37:05 -07:00
Mike Lockwood
38f04c0f28
am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
...
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:34:39 -07:00
Mike Lockwood
11dd5ae97b
Improve Javadoc for USB Manager and MTP/PTP support.
...
Bug: 4091519
Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-01 14:11:50 -04:00
Glenn Kasten
69250839bb
am 4ed59de6: am ffa670b5: Bug 4167061
...
* commit '4ed59de640e46e42b5af3d79448be9da6e79667d':
Bug 4167061
2011-03-31 11:08:52 -07:00
Glenn Kasten
4ed59de640
am ffa670b5: Bug 4167061
...
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
Bug 4167061
2011-03-31 11:06:41 -07:00
Glenn Kasten
ffa670b5b0
Bug 4167061
...
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
2011-03-30 18:50:41 -07:00
Andreas Huber
399792b831
am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
...
* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
When http streaming and Content-Length is unknown, make sure to return all
2011-03-30 15:22:57 -07:00
Andreas Huber
06ac039962
am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
...
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
When http streaming and Content-Length is unknown, make sure to return all
2011-03-30 15:19:46 -07:00
Andreas Huber
b676b73e39
Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
2011-03-30 15:16:36 -07:00
Andreas Huber
45ad57aab3
When http streaming and Content-Length is unknown, make sure to return all
...
data that we successfully received before signalling the error.
Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
2011-03-30 15:00:34 -07:00
Andreas Huber
66ec90687f
am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
...
* commit '8de5df439244e77d7892deceb86520551ff0499c':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
2011-03-30 09:34:15 -07:00
Andreas Huber
8de5df4392
am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
...
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
2011-03-30 09:27:14 -07:00
Brad Fitzpatrick
0ddcc8bc60
am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
...
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-30 08:20:58 -07:00
Andreas Huber
b13c4a9b6c
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
...
Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
2011-03-29 10:00:20 -07:00
Brad Fitzpatrick
b618b2ef87
am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
...
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-28 08:26:02 -07:00
Andreas Huber
e7cedad2b8
am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
...
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:16:52 -07:00
Andreas Huber
2edbdcc6f2
Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1
2011-03-28 08:11:26 -07:00
Christer Fletcher
375fb9bfd2
Handle OutOfMemoryError when decoding images in ThumbnailUtils
...
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
2011-03-28 14:47:55 +02:00
Andreas Huber
59529e1474
After a seek there's a brief period where audio time isn't reestablished.
...
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
2011-03-25 16:40:50 -07:00
Andreas Huber
2fee96bcc0
am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
...
* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 15:38:34 -07:00
Andreas Huber
16ede3c535
Make sure we post a video event when seeking after seeing video EOS before.
...
Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
2011-03-25 14:47:38 -07:00
James Dong
9fb98238e5
am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
...
* commit '837430dd3440f6e71f68ef755399e22386dee084':
Switch to use SF cached source
2011-03-25 10:24:44 -07:00
James Dong
3be1593628
Switch to use SF cached source
...
bug - 3500025
Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
2011-03-25 08:41:57 -07:00
Glenn Kasten
503f4daf01
am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
...
* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
Bug 4159373 Use HDCP debug settings
2011-03-23 17:06:12 -07:00
Glenn Kasten
0b1b2a3212
Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
2011-03-23 17:03:46 -07:00
Glenn Kasten
1b11b64bb6
Bug 4159373 Use HDCP debug settings
...
Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
2011-03-23 16:08:18 -07:00
shailendra
a450ef0668
am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
...
* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
Fix for Media Server memory leak
2011-03-23 15:47:47 -07:00
shailendra
ac390b8cac
Merge "Fix for Media Server memory leak" into honeycomb-mr1
2011-03-23 15:33:51 -07:00
shailendra
2d06aee095
Fix for Media Server memory leak
...
bug - 4081123
Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
2011-03-22 21:30:35 -07:00
shailendra
b819dcd49d
am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
...
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:50:15 -07:00
shailendra
8483073ec2
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
2011-03-22 11:48:12 -07:00
Andreas Huber
3da107288d
am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
...
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
2011-03-22 08:48:58 -07:00
Andreas Huber
453c0d5f16
Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
2011-03-22 08:37:58 -07:00
Yu Shan Emily Lau
112852b577
am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
...
* commit '0210997218fc22b77c71a43a2396419cd0a39166':
Add the mem logging into test utility. Bug# 4108259
2011-03-21 18:00:32 -07:00
Yu Shan Emily Lau
0210997218
Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
2011-03-21 17:32:17 -07:00
Andreas Huber
8505f2fe1e
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
...
Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
2011-03-21 16:45:25 -07:00
Andreas Huber
970d7dd95f
am e2c32e9f: If nothing is to be copied, return right away.
...
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
If nothing is to be copied, return right away.
2011-03-21 16:21:29 -07:00
Andreas Huber
e2c32e9f96
If nothing is to be copied, return right away.
...
This avoids a potential out-of-bounds problem in the code below.
Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
2011-03-21 14:16:03 -07:00
Yu Shan Emily Lau
75afb97c4d
Add the mem logging into test utility.
...
Bug# 4108259
Change-Id: Ifc8091490beef1430a1a0ab297e514b605da56f6
2011-03-18 13:27:51 -07:00
shailendra
a5eaf2eae0
am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:02:35 -07:00
shailendra
d0c2813289
Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
...
Change-Id: I0a7081f901684ff7c7388b830afc6ae2f2ce7bcd
2011-03-18 10:45:29 -07:00
shailendra
0d922ec92d
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
2011-03-18 09:35:37 -07:00
shailendra
c8b4efdd74
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
...
Change-Id: Iab523e666c11b7f99aac71c761a4295d32ca026c
2011-03-17 14:53:20 -07:00
James Dong
9c0c5b5638
am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
...
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
Fix missing AOSP copyright headers for a bunch of media framework files
2011-03-17 11:56:05 -07:00