Yohann Connell
b87bd55555
UI changes for smaller devices and GTV. Fix for defect 4616102.
...
Change-Id: I2fc37199eedfd779494cf9e5c87f53fb1081c1eb
2011-07-26 11:45:39 -07:00
Gloria Wang
025ab6a4dc
Part of fix for bug 4371230.
...
Differentiate native and Java listeners based on the 0x100 bit of unique ID.
Change-Id: I68531947e5fd3ccc702aa6a7590311fdfd89b0f3
2011-07-21 15:14:59 -07:00
Jeff Brown
ba2fd8b297
Remove the simulator target from all makefiles.
...
Bug: 5010576
Change-Id: I49b53eff72af04737cbc22107869ae0169520cd9
2011-07-11 22:12:46 -07:00
Jeff Tinker
ba335957e9
Widevine extractor changes to support secure media buffer playback.
...
Supports either secure or insecure buffer configurations, depending
on the build-time flag REQUIRE_SECURE_BUFFERS.
Change-Id: I5b8150315eced4ed9be656b73d91485a6216819d
2011-06-30 15:47:43 -07:00
Ying Wang
fee0126ed8
Use LOCAL_WHOLE_STATIC_LIBRARIES
...
to include the static libraries in the final shared libraries.
Change-Id: Iecb6b377e2dead41478d88bf576c06bc3ff2d886
2011-06-29 11:09:59 -07:00
Jeff Tinker
0f044e36b9
Merge "Fix for b/4104838 DRM doesn't work on master TOT"
2011-06-28 17:20:35 -07:00
Jeff Tinker
76665fc951
Fix for b/4104838 DRM doesn't work on master TOT
...
Moved final build of widevine DRM plugin into vendor directory for platform
to avoid needing to reference device-specific libs in the Widevine DRM plugin
link.
Also removed some old .sh scripts that are not needed.
Change-Id: Ie6d397c97bc8afd8154f1dddadbab8c7ee524d7a
2011-06-28 15:53:33 -07:00
Gloria Wang
0ca8f17a2e
Change the DRM error code name
...
Merge to master
Change-Id: I9851b24b5327476e1c20c13ab166bc3fc0f98eb9
2011-06-27 10:26:20 -07:00
Jeff Tinker
61cf3d5049
am 77856588: Merge "Fixed 4515636: Playback stops short of end of video." into honeycomb-mr2
...
* commit '77856588ceebe02b72968c2e157b1c387ac7b6fa':
Fixed 4515636: Playback stops short of end of video.
2011-06-09 13:42:28 -07:00
Jeffrey Tinker
56cbd54c1f
am a2841093: Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
...
* commit 'a2841093fd490041c03002722905d39d049d8229':
Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
2011-06-09 13:42:03 -07:00
Jeff Tinker
77856588ce
Merge "Fixed 4515636: Playback stops short of end of video." into honeycomb-mr2
2011-06-08 18:12:12 -07:00
Edwin Wong
bc9604da1f
Fixed 4515636: Playback stops short of end of video.
...
Change-Id: I798fe266fa2fb09ed37e6cb559d87111c9e33639
2011-06-08 18:10:29 -07:00
Jeffrey Tinker
a2841093fd
Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
...
Change-Id: I5227b166867855bafd0516175709ffb4cd1e5e94
2011-06-08 17:50:28 -07:00
Edwin Wong
1ededb8e61
am c3c29486: Uploaded for Robin Connell. Fixed 4466580 Need widevine sample demo player support for adaptive streaming. Thumbnails now show and content plays for adaptive and oem content pages.
...
* commit 'c3c294866b007439ef058db8b8079160bf04d713':
Uploaded for Robin Connell. Fixed 4466580 Need widevine sample demo player support for adaptive streaming. Thumbnails now show and content plays for adaptive and oem content pages.
2011-06-03 15:55:37 -07:00
Jeffrey Tinker
40d160cc3f
am 66d9ff5f: Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
...
* commit '66d9ff5fb5f99ba77e02a4719e4c65aec2aa8c4a':
Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
2011-06-02 13:58:08 -07:00
Edwin Wong
c3c294866b
Uploaded for Robin Connell. Fixed 4466580 Need widevine sample demo player support for adaptive streaming. Thumbnails now show and content plays for adaptive and oem content pages.
...
Change-Id: Id03c7cc01be78d7c5d3d7ca66d2a2773273af6fe
2011-06-01 16:33:10 -07:00
Jeffrey Tinker
66d9ff5fb5
Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
...
Change-Id: Id3a8a997fb1186c6af6e94f2fc2d4788238a0452
2011-05-26 11:25:05 -07:00
Edwin Wong
b07ba401b3
am a7d2e068: Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
...
* commit 'a7d2e068b6df0ae45213224d668fb905d1f9a3ae':
Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
2011-05-25 21:29:21 -07:00
Edwin Wong
a7d2e068b6
Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
...
Change-Id: If9b3e0469040b8c85b32a3196e995a38861a585b
2011-05-25 10:16:55 -07:00
Jeffrey Tinker
fda2f64112
am 8c5545ef: Merge "Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented movie fails with "licens
...
* commit '8c5545ef76f39094b016986c7deec02df682356d':
Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented movie fails with "license expired"
2011-05-24 12:57:28 -07:00
Jeffrey Tinker
36a686c0a4
am 575dc0ad: Merge "Fix for b/4463415 test-wvplayer unit test always returns status 2001" into honeycomb-mr2
...
* commit '575dc0ad5640219620bc236bc527d75019dfbe49':
Fix for b/4463415 test-wvplayer unit test always returns status 2001
2011-05-24 02:56:23 -07:00
Jeffrey Tinker
8c5545ef76
Merge "Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented movie fails with "license expired"" into honeycomb-mr2
2011-05-23 18:12:05 -07:00
Jeffrey Tinker
07b60098b3
Fix for b/4198446 HC - Support for Widevine Adaptive VOD
...
Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed()
Added error logging to diagnose problems such as b/4430078 Playback of newly rented
movie fails with "license expired"
Includes Widevine library build Version 4.5.0.3682
Change-Id: I5708bb3fb92f05a3dd1768620157a795ccebd57a
2011-05-23 18:05:39 -07:00
Jeffrey Tinker
575dc0ad56
Merge "Fix for b/4463415 test-wvplayer unit test always returns status 2001" into honeycomb-mr2
2011-05-21 18:24:48 -07:00
Jeffrey Tinker
18b17056c9
am 3d18aaa2: Merge "Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004" into honeycomb-mr2
...
* commit '3d18aaa20712642aecb21c2df818b194ab43abe1':
Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004
2011-05-19 17:21:24 -07:00
Jeffrey Tinker
3d18aaa207
Merge "Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004" into honeycomb-mr2
2011-05-19 16:30:18 -07:00
Jeffrey Tinker
1ab51c68fc
Fix for b/4463415 test-wvplayer unit test always returns status 2001
...
Fixed test-wvplayer unit test. Some restructuring of the drm plugin broke this test, now it is working again.
This is an important unit test for OEMs developing support for Widevine.
Change-Id: I528608bf594f7211d839a0c3cacc5a69a7301fdf
2011-05-19 16:24:56 -07:00
Jeffrey Tinker
8ad1f14939
am f977e154: Fix for b/4429363: Unable to play rented movie getting error "KEYBOX IS INVALID"
...
* commit 'f977e154c548742b0d7b36f26aed386f3f354dfc':
Fix for b/4429363: Unable to play rented movie getting error "KEYBOX IS INVALID"
2011-05-18 17:48:32 -07:00
Gloria Wang
907dd75e31
Merge "Change the DRM error code name DO NOT MERGE" into honeycomb-mr2
2011-05-18 09:17:56 -07:00
Jeffrey Tinker
c89fe73868
Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004
...
Change-Id: I001d496bc59aa6465c20f85dfade364f4cca33de
2011-05-17 21:27:45 -07:00
Jeffrey Tinker
f977e154c5
Fix for b/4429363: Unable to play rented movie getting error "KEYBOX IS INVALID"
...
Fixed race condition on initialization of WV drm plugin.
Change-Id: Ic4bfd40fe3c241a50da9c182e9f25c98b9a007f2
2011-05-14 04:37:02 -07:00
Gloria Wang
50c2a6b0d8
Change the DRM error code name
...
DO NOT MERGE
Change-Id: I9851b24b5327476e1c20c13ab166bc3fc0f98eb9
2011-05-13 15:11:40 -07:00
Jeffrey Tinker
4d7e693c00
am b0543e30: Fix for b/4375037 Rental expired error message for the newly rented movie Fix for b/4378589 Native crash on playback of same movie rented immediately after expiry Fix for b/4394061 Intermittent license failure with client signature verification error
...
* commit 'b0543e305cc4caaa5e46093877d340ed7b1b4a92':
Fix for b/4375037 Rental expired error message for the newly rented movie Fix for b/4378589 Native crash on playback of same movie rented immediately after expiry Fix for b/4394061 Intermittent license failure with client signature verification error
2011-05-06 23:32:18 -07:00
Jeffrey Tinker
b0543e305c
Fix for b/4375037 Rental expired error message for the newly rented movie
...
Fix for b/4378589 Native crash on playback of same movie rented immediately after expiry
Fix for b/4394061 Intermittent license failure with client signature verification error
Change-Id: Ifafc768c1113ffeca5b0654cbb13db88273eda11
2011-05-06 21:32:06 -07:00
Jeffrey Tinker
bf52c8873a
am e262a49b: Merge "Fix for b/4279535 Seeking in a video causes it to start form beginning" into honeycomb-mr1
...
* commit 'e262a49b8dd85317efad07cfe17abc2b71d3caad':
Fix for b/4279535 Seeking in a video causes it to start form beginning
2011-04-28 13:04:56 -07:00
Jeffrey Tinker
e262a49b8d
Merge "Fix for b/4279535 Seeking in a video causes it to start form beginning" into honeycomb-mr1
2011-04-28 12:59:06 -07:00
Jeffrey Tinker
f360cbb914
am d3679fa5: Edwin\'s fix for b/4282251: AACDecoder log spam after device key failure - required reboot
...
* commit 'd3679fa54b155fbc6299385bd4f77445a3bf3e77':
Edwin's fix for b/4282251: AACDecoder log spam after device key failure - required reboot
2011-04-28 12:59:02 -07:00
Jeffrey Tinker
bc31657ffe
am e48b4f17: Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings Fix for b/4303904: HMJ19 ate my licenses after OTA
...
* commit 'e48b4f1797b4eeab657c461c4e0e995d0b4e1bc2':
Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings Fix for b/4303904: HMJ19 ate my licenses after OTA
2011-04-28 11:46:00 -07:00
Jeffrey Tinker
d3679fa54b
Edwin's fix for b/4282251: AACDecoder log spam after device key failure - required reboot
...
Change-Id: Id28dd6ecf10175dd21a13a3d455ffcf3b4ad8116
2011-04-27 23:06:31 -07:00
Jeffrey Tinker
e7768d52b0
Fix for b/4279535 Seeking in a video causes it to start form beginning
...
Use a longer timeout than normal when seeking
Change-Id: I8c1306818e5fffefc15c33bd4f412f9346e8dc7e
2011-04-27 19:31:18 -07:00
Jeffrey Tinker
e48b4f1797
Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings
...
Fix for b/4303904: HMJ19 ate my licenses after OTA
Change-Id: Ife18b525cb8166c618fca1c5932950a29437bbb4
2011-04-27 16:32:44 -07:00
Jeffrey Tinker
cc09fa33d4
am 88aa52ff: Merge "Implement new heartbeat error codes" into honeycomb-mr1
...
* commit '88aa52ffdfbb40fcd29059011259a3ba76e51e1d':
Implement new heartbeat error codes
2011-04-27 12:28:57 -07:00
Jeffrey Tinker
88aa52ffdf
Merge "Implement new heartbeat error codes" into honeycomb-mr1
2011-04-27 11:51:28 -07:00
Jeffrey Tinker
a6758ad20e
Implement new heartbeat error codes
...
Related to defect b/4322415
Change-Id: I2bd41e70dcb64a03a94b3770732149a6f2489a8e
2011-04-27 11:14:13 -07:00
Jeffrey Tinker
961f4858aa
am 7f53ca16: Fix for b/4330146: license corruption after OTA update Fix for b/4217102: ANR after the movie expired Fix for b/4202971 ANR upon expiry during playback, followed by license fetch failure
...
* commit '7f53ca16473040cc5d5b0851797a6e9d063c02e0':
Fix for b/4330146: license corruption after OTA update Fix for b/4217102: ANR after the movie expired Fix for b/4202971 ANR upon expiry during playback, followed by license fetch failure
2011-04-26 12:45:21 -07:00
Jeffrey Tinker
7f53ca1647
Fix for b/4330146: license corruption after OTA update
...
Fix for b/4217102: ANR after the movie expired
Fix for b/4202971 ANR upon expiry during playback, followed by license fetch failure
Change-Id: Ieb6e6392ca74333517889f7b14ec508234a8d805
2011-04-25 14:21:35 -07:00
Jeffrey Tinker
73820d2d4e
am a342c082: Fix for b/4331109, b/4332630, b/4274620 HTTPClient thread leak
...
* commit 'a342c0828cb76271ddf1fc6770c5c054bb0b25a9':
Fix for b/4331109, b/4332630, b/4274620 HTTPClient thread leak
2011-04-24 08:00:51 -07:00
Jeffrey Tinker
c7893c03f3
am 83ce3527: Fix for b/4291356 video stopped playing with dialog "video being played on another device"
...
* commit '83ce3527440ed3da3c2f95d4add15a60ae89cc48':
Fix for b/4291356 video stopped playing with dialog "video being played on another device"
2011-04-24 08:00:47 -07:00
Jeffrey Tinker
a342c0828c
Fix for b/4331109, b/4332630, b/4274620 HTTPClient thread leak
...
Also added logging to heartbeats so we can detect failures better
during testing.
Resolved merge conflict from https://android-git.corp.google.com/g/#change,107298
Change-Id: I0d731f4d21555eff7c80e34fed4b8c335023edc1
2011-04-23 04:03:38 -07:00
Jeffrey Tinker
83ce352744
Fix for b/4291356 video stopped playing with dialog "video being played on another device"
...
Change-Id: Ia70eedde075d740598c6a1ab5d26bcde8be43668
2011-04-21 11:22:32 -07:00