Commit Graph

58 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Jeffrey Tinker
ebe78279ba am 1445a428: Fix for b/4198399. This reverts the change for 4194032.
* commit '1445a4288de385346d666c6c33b7cfa3c92cf4ce':
  Fix for b/4198399.  This reverts the change for 4194032.
2011-04-01 11:10:51 -07:00
Jeffrey Tinker
1445a4288d Fix for b/4198399. This reverts the change for 4194032.
Change-Id: I20401f58de0874f48b5ed0fac416c18d13b1856b
2011-03-31 18:57:13 -07:00
Jeffrey Tinker
e121813fef am c0a82d66: Merge "Fixes for b/4194032, b/4192318 and b/4190560" into honeycomb-mr1
* commit 'c0a82d66b299f0fc00c85c88f5d8076f08d30aaa':
  Fixes for b/4194032, b/4192318 and b/4190560
2011-03-30 17:34:58 -07:00
Jeffrey Tinker
7c606db261 Fixes for b/4194032, b/4192318 and b/4190560
Found in online/offline testing with heartbeat server:

b/4194032 - when streaming playback is stopped the streaming license is not removed
b/4192318 - streaming licenses are allowing offline playback
b/4190560 - offline heartbeats stopping video playback

Change-Id: Iacf31f559d6b374752ca1b7f2b93d4ec8a4d7440
2011-03-30 10:31:09 -07:00
Jeffrey Tinker
c761a8635e am e406097d: Merge "Fix for b/4173711 - license acquire fails on slow wifi" into honeycomb-mr1
* commit 'e406097da64e998078d1b6df099f3f024c0a847d':
  Fix for b/4173711 - license acquire fails on slow wifi
2011-03-29 12:38:23 -07:00
Jeffrey Tinker
e406097da6 Merge "Fix for b/4173711 - license acquire fails on slow wifi" into honeycomb-mr1 2011-03-29 12:33:35 -07:00
Jeffrey Tinker
0b09443e11 Fix for b/4173711 - license acquire fails on slow wifi
Change-Id: Ibc846a4cb55ab30008ac8739860593cbb94207b5
2011-03-28 15:57:35 -07:00
Guru Nagarajan
652a8e37c5 am 00ef41ab: Removed the trailing line at the end of the file.
* commit '00ef41ab7309c1a4c494e44f251c0e6d1c7e6c82':
  Removed the trailing line at the end of the file.
2011-03-28 10:05:53 -07:00
Guru Nagarajan
c35ea4b5f2 am 2ea5ad1f: Added widevine feature file to enable clients to lookup wv drm feature
* commit '2ea5ad1f00b80f812d84b431faa6517277beb58f':
  Added widevine feature file to enable clients to lookup wv drm feature
2011-03-28 10:05:51 -07:00
Guru Nagarajan
00ef41ab73 Removed the trailing line at the end of the file.
Change-Id: I11331adc15a534135e2a2eee27b2be53dc30cdc9
2011-03-27 21:24:01 -07:00
Guru Nagarajan
2ea5ad1f00 Added widevine feature file to enable clients to lookup wv drm feature
Change-Id: Iabd2db92c325d1969eca2169f518238f3cb7ac3d
2011-03-25 19:19:37 -07:00
Jeffrey Tinker
767717376d am 18617b93: fix for b/4126624 Widevine DRM client not sending heartbeats
* commit '18617b93c67b87bd4b8a6eb5e5d0c6e23fe82d32':
  fix for b/4126624 Widevine DRM client not sending heartbeats
2011-03-25 14:54:18 -07:00
Jeffrey Tinker
18617b93c6 fix for b/4126624 Widevine DRM client not sending heartbeats
Added some missing parameters to the heartbeat message, found in end-to-end
testing with youtube.  Also enabled heartbeats on client builds.

Change-Id: I445fb0cb168e63a041f0ecf828eaad493143a648
2011-03-25 14:02:08 -07:00
Jeffrey Tinker
a39b73cec3 am ba5fa0ef: Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes Also includes b/3500025: A/V resync issues
* commit 'ba5fa0ef570f6ca3524f8158a23371528930f0fc':
  Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes Also includes b/3500025: A/V resync issues
2011-03-25 10:13:54 -07:00
Jeffrey Tinker
ba5fa0ef57 Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes
Also includes b/3500025: A/V resync issues

Change-Id: Ib885d7219d211b188f38e9427bdaecd10fbd7329
2011-03-25 07:20:49 -07:00
Jeffrey Tinker
c585611949 am 7458d581: Merge "Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs." into honeycomb-mr1
* commit '7458d581cd7b7fdcb620ae12bfe453084186a484':
  Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs.
2011-03-18 16:56:53 -07:00
Jeffrey Tinker
81474cec4c am 6bed7bfe: Fix for b/4132041 Widevine DRM plugin getConstraints not returning error
* commit '6bed7bfe90dfac8d24a25842dadb5e35088f2cbe':
  Fix for b/4132041 Widevine DRM plugin getConstraints not returning error
2011-03-18 16:56:51 -07:00
Jeffrey Tinker
7458d581cd Merge "Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs." into honeycomb-mr1 2011-03-18 16:08:59 -07:00
Jeffrey Tinker
6bed7bfe90 Fix for b/4132041 Widevine DRM plugin getConstraints not returning error
Change-Id: I07f02aabb4b68287eb7978abb5d106c86f2790b6
2011-03-18 13:29:28 -07:00
Jeffrey Tinker
55b05dab92 Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs.
Change-Id: Iaa577416f3996677af234738ac0cd3344bbee9bc
2011-03-18 12:14:31 -07:00
Jeffrey Tinker
cc4b949d8d am dac95750: Merge "Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event" into honeycomb-mr1
* commit 'dac957507c88a85af84633f6ce6ad2a69e33b016':
  Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event
2011-03-17 18:06:40 -07:00
Jeffrey Tinker
f06975ea45 am cd11ce46: Fix unresolved reference to libtpa in tervigon (wingray) builds
* commit 'cd11ce46355872241a4d0c6168fe0a9631de7d2d':
  Fix unresolved reference to libtpa in tervigon (wingray) builds
2011-03-17 18:06:38 -07:00
Jeffrey Tinker
dac957507c Merge "Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event" into honeycomb-mr1 2011-03-17 17:26:12 -07:00
Jeffrey Tinker
48305130a4 Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event
Change-Id: Ib892b3ca259b364e4ef04ee34d5a8b9d4458812f
2011-03-17 13:00:36 -07:00
Jeffrey Tinker
cd11ce4635 Fix unresolved reference to libtpa in tervigon (wingray) builds
Change-Id: I9ef5f52e319513b4186b8cbc61b8a7d047c6bf26
2011-03-16 23:17:06 -07:00
Jeffrey Tinker
f7bdedda41 am 778b5ce2: Fix for b/3501089 Require an API in the DRM client to specify the license type (offline/streaming) and b/4084670 Define events in DRM API to support license expiration, revocation, license failure. Implements events and license changes as documented in t
* commit '778b5ce26f691119f6c275538dc56a63179d93f2':
  Fix for b/3501089 Require an API in the DRM client to specify the license type (offline/streaming) and b/4084670 Define events in DRM API to support license expiration, revocation, license failure.  Implements events and license changes as documented in the Widevine_Java_API_for_Android_DRM_Framework spec
2011-03-16 14:37:48 -07:00