widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,283 Commits 2 Branches 0 Tags
20bd476104e77fba10e7be32912409029530da83
Commit Graph

1283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edwin Wong
91a5fce49a am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
* commit '9b787415d9e56812b41abf460db18100092f5cf1':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2014-08-09 00:11:06 +00:00
Edwin Wong
2732fb7f3c am 93df2f3e: am b79dfd6f: am 00b7d578: Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE **** 
* commit '93df2f3e5615b592397331b1ac01df0097e27b0d':
  Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
 2014-08-09 00:10:09 +00:00
Edwin Wong
93df2f3e56 am b79dfd6f: am 00b7d578: Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE **** 
* commit 'b79dfd6f9d5142cfb33d660db3afa22a67190867':
  Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
 2014-08-09 00:05:00 +00:00
Edwin Wong
b79dfd6f9d am 00b7d578: Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE **** 
* commit '00b7d5781488224cd62a115a9ee844060bca5eef':
  Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
 2014-08-09 00:02:07 +00:00
Edwin Wong
15ef647c31 Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10864/

bug: 15932110
Change-Id: Ida38800be568acce427e82e6df86044747c34a64
 2014-08-08 15:42:36 -07:00
Rahul Frias
ef8d6dd570 am 4819a26b: Fixes for query information and usage reporting 
* commit '4819a26bd4ff7d9736f13e1b69611139f4a5d183':
  Fixes for query information and usage reporting
 2014-08-08 02:33:42 +00:00
Edwin Wong
9b787415d9 Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE **** 
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10864/

bug: 15932110

Change-Id: Ia75295329b9ce6d43dd519feb032c0c5597b419a
 2014-08-07 18:46:45 -07:00
Rahul Frias
4819a26bd4 Fixes for query information and usage reporting 
* The Usage APIs return usage reports from either L1 or L3 (if available).
* Correction to when usage reports are saved. In addition to other events
  they are now saved when keys are loaded, usage reports are released and soon
  after first decryption and periodically (60 seconds) after that,
  if decryption takes place.
* Usage reports now get deleted on an unprovision request.
* Policy timer is now started when offline licenses are restored.
* Usage session is now released, when a usage response is received.
* Usage tests ahev been enabled.
* Added CDM extended duration (integration) tests to test usage reporting
  and querying. These need to be run manually as they take a while (currently
  half an hour).

b/15592374

[ Merge of https://widevine-internal-review.googlesource.com/#/c/10800
  from the Widevine CDM repo ]

Change-Id: Ia817e03ebbe880e08ba7b4a235ecb82b3ff35fbf
 2014-08-07 10:58:40 -07:00
Edwin Wong
00b7d57814 Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE **** 
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10860/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10861/

Fix openssl build:
https://widevine-internal-review.googlesource.com/#/c/10865/

bug: 15932110
Change-Id: Iad0682bc686681d716b7976b95cd2b359185450c
 2014-08-06 16:22:32 -07:00
John "Juce" Bruce
d5a451a1eb am b608e17e: Add Properties to Query HDCP Status and Usage Reporting Support 
* commit 'b608e17e0868056690b1574e6a48346e3083414c':
  Add Properties to Query HDCP Status and Usage Reporting Support
 2014-08-06 23:01:37 +00:00
John "Juce" Bruce
b608e17e08 Add Properties to Query HDCP Status and Usage Reporting Support 
This is a merge of http://go/wvgerrit/10846/ from the Widevine repository.

Change-Id: I682069073d9ec58c03781de25d9c6fa5ec5864ff
 2014-08-05 18:29:25 -07:00
Jeff Tinker
4b4f5bbf36 am 3099da61: Merge "Support Device Unprovisioning" into lmp-dev 
* commit '3099da6170222d2c9e03d8b735b570872bdc5ae5':
  Support Device Unprovisioning
 2014-08-04 21:01:12 +00:00
Rahul Frias
8723ca816a am 0fa4bee2: Merge "Allow offline release retries" into lmp-dev 
* commit '0fa4bee2a57f49c7598afea706d9f0e1d157a7df':
  Allow offline release retries
 2014-08-01 20:59:43 +00:00
Jeff Tinker
3099da6170 Merge "Support Device Unprovisioning" into lmp-dev 2014-08-01 13:51:29 +00:00
John "Juce" Bruce
4db7780cb5 Support Device Unprovisioning 
Merge of https://widevine-internal-review.googlesource.com/#/c/10845/
from the widevine cdm repo.

Bug: 12247651
Change-Id: Ice6ec95865640fa2f736c7a9f09956395d648337
 2014-08-04 13:07:20 -07:00
Fred Gylys-Colwell
24d03889ce am a29883b0: (-s ours) am 717837ff: (-s ours) Update Protobuf Directory in Makefile (DO NOT MERGE) 
* commit 'a29883b0a0e0c6a042653720a0ee36813e034d61':
  Update Protobuf Directory in Makefile (DO NOT MERGE)
 2014-07-30 23:05:18 +00:00
Fred Gylys-Colwell
a29883b0a0 am 717837ff: (-s ours) Update Protobuf Directory in Makefile (DO NOT MERGE) 
* commit '717837ff00e9057f8daee53c05d73522d88ccb6f':
  Update Protobuf Directory in Makefile (DO NOT MERGE)
 2014-07-30 22:53:51 +00:00
Fred Gylys-Colwell
717837ff00 Update Protobuf Directory in Makefile (DO NOT MERGE) 
This update to Android.mk allows the protobuffers to be compiled and
the code to see them in the correct directories.

This change is manualy merged from master, so should not be merged back.

bug 15987446

Change-Id: I8676567c33a6ebb87a2904bff9f3aa9ce093664b
 2014-07-30 13:01:16 -07:00
Rahul Frias
0fa4bee2a5 Merge "Allow offline release retries" into lmp-dev 2014-07-24 15:36:21 +00:00
Rahul Frias
9f52cd3724 Allow offline release retries 
A bug prevented regenerating license release requests. This has
been corrected. A crash due to a formatting error has been addressed.
Clean up of logging and additional logging for open session failures
have been included.

b/16197822

Merge of https://widevine-internal-review.googlesource.com/#/c/10806
from the widevine cdm repo.

Change-Id: I854ead388f311d00b1cd700dfa1b2f58322c2dd4
 2014-07-29 02:06:09 -07:00
Rahul Frias
e894774942 Correct CancelKeyRequest behavior 
[ Merge of https://widevine-internal-review.googlesource.com/#/c/10659/
  from the widevine cdm repo. ]

CdmEngine::CancelKeyRequest would earlier release keys by closing and
reopening a crypto session. Behavior has been changed to just close
the session.

b/15984869

Change-Id: I92a1f82fd4a97b5510596d4bc69bf07406cee606
 2014-07-21 14:36:50 -07:00
Fred Gylys-Colwell
a19a965fb7 Close session after provisioning 
Merge of CDM change:
https://widevine-internal-review.googlesource.com/#/c/10691/

This prevents the provisioning session from being created unless the
device needs provisioning.  And then, after provisioning, it closes
the session it had previously opened.

b/15782159 CertificateProvisioning object keeps unused CryptoSession

Change-Id: Ic52ed864fa47c7ba50b7ca4d9fea1e74930228e9
 2014-07-18 13:54:42 -07:00
Lajos Molnar
174a218b30 Support nonblocking reads for secure source (video) 
Bug: 15699665
Change-Id: If67c3196b42b24333ace1373711dc3f4eb30f0da
 2014-07-17 20:32:28 -07:00
Fred Gylys-Colwell
b8003f12b4 Streamline cast certificate loading 
This CL adds special code to create a session and sign a
message with an RSA key without initializing the full session.

This is to fix:
b/16130551 Molly does not show up in CAST device list

Change-Id: I4a14b312ef67e666c7c9504fe8135c6924be4c0d
 2014-07-14 20:11:16 -07:00
Rahul Frias
7a933ee48e Merge of usage reporting and license changes from WV CDM repo 
* CdmSession unittest and license request time changes
  b/15914199
  Merge of https://widevine-internal-review.googlesource.com/#/c/10597/

* Specify OEMCrypto API version in client capabilities
  b/15388863
  Merge of https://widevine-internal-review.googlesource.com/#/c/10616/

* Report start and last play time in license request
  b/15995227
  Merge of https://widevine-internal-review.googlesource.com/#/c/10617/

* Respect can_play flag
  b/15330338
  Merge of https://widevine-internal-review.googlesource.com/#/c/10619/

* Restore offline session information
  b/16009274
  Merge of https://widevine-internal-review.googlesource.com/#/c/10641/

Change-Id: I17fdc309efbc1d44385a86a368df11b1349b29c2
 2014-07-02 17:17:38 -07:00
Fred Gylys-Colwell
9b4da994ec Merge "Build Level 3 Haystack for Android MIPS" 2014-07-02 19:00:44 +00:00
Rahul Frias
b18b2784bc Downgrade Property Set Errors to Warnings 
(This is a merge of
https://widevine-internal-review.googlesource.com/#/c/10630/
from the Widevine CDM Repo.)

We get a fair bit of noise from bug-filers who are concerned about
several non-critical errors that show up when using our CDM without
property sets. This CL removes these logs since it falls within the range
of expected behavior.

Bug: 15136575
Change-Id: Iad4eb638b03db0104b202b59b367d344c05ead5a
 2014-07-02 16:22:13 -07:00
Fred Gylys-Colwell
d5f06554b3 Build Level 3 Haystack for Android MIPS 
Merge of Widevine CDM change:
https://widevine-internal-review.googlesource.com/#/c/10644/

android/level3/mips/libwvlevel3.a  NONOB Level3 Library Jul  2 2014 11:40:23
android/level3/x86/libwvlevel3.a  Level3 Library May 16 2014 23:14:03
android/level3/arm/libwvlevel3.a  Level3 Library Jul  2 2014 12:34:56

bug: 15186272
Change-Id: I9d89476f20a69a66849a20f7b9b6be0d6175578b
 2014-07-02 14:22:30 -07:00
Fred Gylys-Colwell
12edc84be8 Merge changes If26ecc5d,I8ae472f1 
* changes:
  Correct ExoPlayer version
  Match GenerateRSASignature unit test code with actual code
 2014-07-02 18:50:12 +00:00
Fred Gylys-Colwell
302b38e6a2 Correct ExoPlayer version 
The previous merge copied the wrong version of Exoplayer.

Change-Id: If26ecc5dc6c3374b6482bd619eafa7432f92f185
 2014-07-02 14:14:01 -07:00
John "Juce" Bruce
4b8dd050bf Downgrade Non-Critical Errors to Warnings 
We are getting a lot of noise from Android bug-filers who are
concerned about several non-critical errors that show up when using
Widevine CDM on some devices or in some use cases. To mitigate this,
we are downgrading these errors to warnings.

Some of these errors pertained to our legacy support. To make sure
an error IS logged if problems with legacy support become critical,
a new error has been added to that code path.

Bug: 15136575
Change-Id: Id28bcf507f277a5d2f35a14da71bba2b118a54fe
 2014-07-01 16:24:39 -07:00
Fred Gylys-Colwell
86f945e8e2 Match GenerateRSASignature unit test code with actual code 
Merge of Widevine CDM change:
https://widevine-internal-review.googlesource.com/#/c/10620/

bug: 15829029
Change-Id: I8ae472f1f72f9a260de3e9443b104bea27ab6eb3
 2014-07-01 15:42:30 -07:00
Rahul Frias
2ec3049bda CDM workarounds for OEMCrypto issues 
Merge of https://widevine-internal-review.googlesource.com/#/c/10614/
from the widevine cdm repo.

* b/15467844 - GenerateRSASignature returns OEMCrypto_ERROR_INVALID_CONTEXT
  when called with a non-NULL signature pointer and signature length of
  0 (rather than OEMCrypto_ERROR_SHORT_BUFFER)
* b/15989260 - OEMCrypto_DecryptCTR does not return OEMCrypto_ERROR_KEY_EXPIRED
  after keys have expired

Also addresses
* integration test updated to reflect that loading certificate errors are
  returned on OpenSession rather than GenerateKeyRequest
* compiler warning on type casting

b/15989261

Change-Id: Ib68b972651479e99b9d05de4493aac55a96c4f39
 2014-07-01 13:30:23 -07:00
Fred Gylys-Colwell
2c0b1d6142 Merge "Merge Changes from CDM repository" 2014-07-01 19:22:38 +00:00
Fred Gylys-Colwell
b5e8b87fed Merge Changes from CDM repository 
This CL merges the following changes from the Widevine repository:

Avoid CdmSession reinitialization
https://widevine-internal-review.googlesource.com/#/c/10530/

Fix timer-related unit tests.
https://widevine-internal-review.googlesource.com/#/c/10510/

Correct return statement
bug: 15590802
https://widevine-internal-review.googlesource.com/#/c/10553/

Usage reporting fixes
bug/15388863
https://widevine-internal-review.googlesource.com/#/c/10460/

Make public methods virtual
https://widevine-internal-review.googlesource.com/#/c/10500/

Fix the SetTimer contract in the CDM.
https://widevine-internal-review.googlesource.com/#/c/10493/

Move inline CDM methods, add OVERRIDE.
https://widevine-internal-review.googlesource.com/#/c/10475/

Simplify storage APIs related cleanup.
https://widevine-internal-review.googlesource.com/#/c/10473/

Duration values are not correctly reported when queried
b/15592374
https://widevine-internal-review.googlesource.com/#/c/10437/

Propagate IsKeyValid() through ContentDecryptionModule.
https://widevine-internal-review.googlesource.com/#/c/10483/

Minor clean up in config_test_env.
https://widevine-internal-review.googlesource.com/#/c/10440/

General clean up.
https://widevine-internal-review.googlesource.com/#/c/10441/

Refactor HttpSocket and simplify UrlRequest interface.
https://widevine-internal-review.googlesource.com/#/c/10410/

Install good keybox at end of unit tests
b/15385981
https://widevine-internal-review.googlesource.com/#/c/10374/

Privacy crypto fixes
b/15475012
https://widevine-internal-review.googlesource.com/#/c/10383/

Incorporate header files to resolve build issued based on customers feedback.
https://widevine-internal-review.googlesource.com/#/c/10420/

Support unprovisioning
b/12247651
https://widevine-internal-review.googlesource.com/#/c/10356/

Correct usage of Host::Allocate and Cdm::Decrypt.
https://widevine-internal-review.googlesource.com/#/c/10378/

Fix logging bug, arguments in wrong order.
https://widevine-internal-review.googlesource.com/#/c/10380/

Rename types that look like constants.
https://widevine-internal-review.googlesource.com/#/c/10379/

Fix offline test failures
b/13909635
https://widevine-internal-review.googlesource.com/#/c/10348/

Add -DUNIT_TEST to the unit test makefile for Android
https://widevine-internal-review.googlesource.com/#/c/10375/

Refactor privacy-crypto and add dummy version.
https://widevine-internal-review.googlesource.com/#/c/10353/

Remove References to Apiary
https://widevine-internal-review.googlesource.com/#/c/9924/

Delete oldest entry in usage table when full
bug: 15184824
https://widevine-internal-review.googlesource.com/#/c/10295/

Port DeviceFiles to iOS.
https://widevine-internal-review.googlesource.com/#/c/10355/

Make testing functions in DeviceFiles private.
https://widevine-internal-review.googlesource.com/#/c/10354/

Add RSA encryption to haystack
https://widevine-internal-review.googlesource.com/#/c/10280/

Add string and vector includes to CDM header.
https://widevine-internal-review.googlesource.com/#/c/10352/

First version of oemcrypto logging
https://widevine-internal-review.googlesource.com/#/c/10252/

Update Names of Secure Stop Methods
bug: 11987015
https://widevine-internal-review.googlesource.com/#/c/10152/

Adjust timing on the Usage Table unit test
https://widevine-internal-review.googlesource.com/#/c/10307/

Fix all compiler warnings in CDM source release.
https://widevine-internal-review.googlesource.com/#/c/10293/

Fix memset bug: args in wrong order
https://widevine-internal-review.googlesource.com/#/c/10292/

Partial revert of 'Remove refs to test prov server, Level3 support...'
https://widevine-internal-review.googlesource.com/#/c/10281/

Pack structure OEMCrypto_PST_Report
https://widevine-internal-review.googlesource.com/#/c/10243/

Remove refs to test prov server, Level3 support; remove dead code
https://widevine-internal-review.googlesource.com/#/c/10220/

Partial revert of 'Document data strings; clean up license server parameters.'
https://widevine-internal-review.googlesource.com/#/c/10188/

Document data strings; clean up license server parameters.
https://widevine-internal-review.googlesource.com/#/c/10120/

Fix broken build after partner branch merge.
https://widevine-internal-review.googlesource.com/#/c/10181/

TODO Cleanup - core/src, core/include
https://widevine-internal-review.googlesource.com/#/c/9965/

TODO Cleanup - cdm, chromium, core/test.
https://widevine-internal-review.googlesource.com/#/c/9419/

Remove unneeded properties.
https://widevine-internal-review.googlesource.com/#/c/10162/

Change-Id: If2bb9d743a562a3875bebb91933c0aaadea286b2
 2014-06-27 18:59:56 +00:00
Jeff Tinker
b3a031ded1 Handle ResourceBusyException from MediaDrm.openSession 
Change-Id: I21dc9b194ba1195fd28071cdd213cae489b67387
related-to-bug: 13792521
 2014-06-26 08:59:02 -07:00
Jeff Tinker
8a8feb747c am ccc0ebc4: am ec3cf9d1: am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration. 
* commit 'ccc0ebc470f2178339ff7c18a38ff2f763011edc':
  Update license and content server URLs due to server migration.
 2014-06-19 00:40:40 +00:00
Jeff Tinker
ccc0ebc470 am ec3cf9d1: am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration. 
* commit 'ec3cf9d12b77f118229f1994a0f84a6a346063ce':
  Update license and content server URLs due to server migration.
 2014-06-19 00:31:05 +00:00
Jeff Tinker
ec3cf9d12b am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration. 
* commit '54155e3d6892280a84043effa67116851e9f86df':
  Update license and content server URLs due to server migration.
 2014-06-19 00:27:19 +00:00
Jeff Tinker
54155e3d68 am 9a9da0e0: Update license and content server URLs due to server migration. 
* commit '9a9da0e040ee73fb38375e0a27be4e021d8887d5':
  Update license and content server URLs due to server migration.
 2014-06-19 00:23:09 +00:00
Jeff Tinker
9a9da0e040 Update license and content server URLs due to server migration. 
Only affects OEM integration tests, not production code.

bug: 15600077
Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
(cherry picked from commit a53677d27c)
 2014-06-17 11:46:37 -07:00
Jeff Tinker
2a5754f338 Revert "Update license and content server URLs due to server migration." 
This reverts commit a53677d27c.

Change-Id: I9afbc9aa95cc0cf518ef1fd378dccdc5874afaa4
 2014-06-17 17:59:40 +00:00
Jeff Tinker
a53677d27c Update license and content server URLs due to server migration. 
Only affects OEM integration tests, not production code.

bug: 15600077
Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
 2014-06-13 14:09:31 -07:00
Edwin Wong
0b6b0372c0 am f6dd49f0: am 9ba13504: am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test. 
* commit 'f6dd49f04a81cde7d4e241c15f8b2b2328bf9d9e':
  Fixed intermittent failure in GTS test.
 2014-06-11 22:51:28 +00:00
Edwin Wong
f6dd49f04a am 9ba13504: am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test. 
* commit '9ba13504396cc6a98e610894df8efb1f4fdc208f':
  Fixed intermittent failure in GTS test.
 2014-06-11 22:45:09 +00:00
Edwin Wong
9ba1350439 am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test. 
* commit 'cf4cd54924ee8b157b97f24696613d9edbe26570':
  Fixed intermittent failure in GTS test.
 2014-06-11 22:40:34 +00:00
Edwin Wong
cf4cd54924 am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test. 
* commit '1c68225dac88b0fe75b11a651613dc776f471ea8':
  Fixed intermittent failure in GTS test.
 2014-06-11 22:35:46 +00:00
Edwin Wong
1c68225dac am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test. 
* commit '50bfcfdbf8218fe878d5c135a27879d8977c5092':
  Fixed intermittent failure in GTS test.
 2014-06-11 22:25:08 +00:00
Edwin Wong
50bfcfdbf8 am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test. 
* commit 'e8fbb466028620f216f6ae698835a0af848f888a':
  Fixed intermittent failure in GTS test.
 2014-06-11 22:21:20 +00:00
Edwin Wong
e8fbb46602 am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test. 
* commit '8daed73ef7305c95abd28cd27c5bd13b3ae8b936':
  Fixed intermittent failure in GTS test.
 2014-06-11 22:19:12 +00:00