Edwin Wong
1afb1066cc
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905
...
am: ee415b7b68
2015-10-20 04:14:58 +00:00
Edwin Wong
d5a1d5d58d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71
...
am: 5754438dc1
2015-10-20 04:13:17 +00:00
Edwin Wong
ee415b7b68
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968
...
am: 94dab9e905
2015-10-20 04:13:17 +00:00
Edwin Wong
5754438dc1
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e
...
am: 9617db4d71
2015-10-20 04:11:35 +00:00
Edwin Wong
94dab9e905
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03
...
am: 655574d968
2015-10-20 04:11:35 +00:00
Edwin Wong
655574d968
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d
...
am: 27133e7a03
2015-10-20 04:08:24 +00:00
Edwin Wong
9617db4d71
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
am: f78b0e780e
2015-10-20 04:08:23 +00:00
Edwin Wong
f78b0e780e
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
Change-Id: I3a89161de0bf84fc6257338a3e932b90feba3f82
2015-10-19 20:59:36 -07:00
Edwin Wong
27133e7a03
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
am: f7c043f32d
2015-10-20 02:59:35 +00:00
Edwin Wong
c0b8030851
resolve merge conflicts of 769288d009 to jb-mr1.1-docs.
...
Change-Id: I26df84f2907bcd18a2646bec0fbe53d9624e5a9b
2015-10-19 18:32:07 -07:00
Edwin Wong
f7c043f32d
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
Change-Id: Ia5dd0316bb057dbc2e185f720d194548d2a370a6
2015-10-19 18:22:48 -07:00
Edwin Wong
fea63b4062
am 1e4bfd6f: Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
...
* commit '1e4bfd6f593877467514657c065e897b49db8a75':
Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2014-08-25 18:28:46 +00:00
Edwin Wong
769288d009
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: Ibdeccd4de9625b6bbb57e5b8c35deb9f51a2b65d
2014-08-20 16:39:49 -07:00
Edwin Wong
1e4bfd6f59
Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
...
The toolchains that built the previous x86 libraries are no longer available.
Attempt to patch the tools was unsuccessful and the output will be greatly different
from previous build, and we do not have any jb-dev x86 devices in house for testing.
The x86 libraries were a special build for specific vendors. Therefore, the x86
libraries will not be updated in this CL.
The arm libraries were built using the same toolchains and svn revision as the previous
version, with updated Jam files pointing to openssl-0.9.8za.
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: I72ef476d8900418aae76e05eb9cb30154c911ede
2014-08-20 11:12:45 -07:00
Edwin Wong
7fd9234226
am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit 'abee817fbffe335ddda3ecf7ef019ef2ef75c3f2':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 21:52:37 +00:00
Edwin Wong
abee817fbf
am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit 'bf68c58666e1cab7f6ed384baaaf310c7db15800':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 21:48:21 +00:00
Edwin Wong
bf68c58666
am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '15ef647c317cabe84c73b1f05c7f5fc45f383462':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 21:44: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
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
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
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
Edwin Wong
8daed73ef7
am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '4f962df0b93564d3dbf62855279e2ea2ac4f1191':
Fixed intermittent failure in GTS test.
2014-06-11 22:15:56 +00:00
Edwin Wong
4f962df0b9
am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit 'c1dee5d84735b41dfd92f956418b833e1842a2be':
Fixed intermittent failure in GTS test.
2014-06-11 22:12:24 +00:00
Edwin Wong
c1dee5d847
am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '35ebeec71f3f0d0b763f1ef8cf3b98bae2aeee2e':
Fixed intermittent failure in GTS test.
2014-06-11 22:08:36 +00:00
Edwin Wong
35ebeec71f
am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit 'f6ffee472c33b85d21c820862c398406e1c964b5':
Fixed intermittent failure in GTS test.
2014-06-11 22:05:25 +00:00
Edwin Wong
f6ffee472c
Fixed intermittent failure in GTS test.
...
Need to clear mEncKey in constructor, otherwise, decrypted data is wrong.
bug: 15540382
Change-Id: I0e2d4d6edd8a5800fa2a36e9f258782edc493e13
2014-06-11 11:39:28 -07:00
Edwin Wong
35c8fc9470
am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '15d45e0c77c6bd6f7f6931957b254b01339d69ea':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:13:18 +00:00
Edwin Wong
15d45e0c77
am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '8ca56c3f12f4aaa145288b0838b23fa6c2d7c6fb':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:11:02 +00:00
Edwin Wong
8ca56c3f12
am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '01403eff12109f2388d85971b5c17b67bd0c4925':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:08:40 +00:00
Edwin Wong
01403eff12
am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit 'c9c20cc64803bf885746b3c9ebe6b8f19bff9bfd':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:05:17 +00:00
Edwin Wong
c9c20cc648
am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '62d845404c0b5cfb5bb0e0e3f4fcd12970a5ba72':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:01:34 +00:00
Edwin Wong
62d845404c
am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '1825fda8fda9c5037cacc175f3d2ef1579fd7cb0':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:59:32 +00:00
Edwin Wong
1825fda8fd
am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '964494409f2ce720557eb617ef44caf9ac10c05d':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:56:16 +00:00
Edwin Wong
964494409f
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
To make the information readily accessible for vendors who have signed the IDA
and to better sync the doc to our code base.
Access to /vendor/widevine is controlled and vendors need to sign the IDA.
bug: 14228621
Change-Id: I3aaa2574d99c0123cb5e0fe0f093763a973aefaf
2014-04-24 15:32:29 -07:00
Jeff Tinker
65a35c7df6
Update DASH demo player for OEMs
...
OEMs testing Widevine/DASH playback have requested
additional test content. This updated demo apk
provides it.
bug: 12789209
Change-Id: Idba85a1569bc59e43cfcb15b762d0d5da74c91aa
2014-04-04 12:09:53 -07:00
John "Juce" Bruce
5a2e3f4136
am 1e0e3e3a: (-s ours) am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
...
* commit '1e0e3e3a9f220077a4bd61a8b34ad52d66773d1a':
DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
2013-10-01 15:23:13 -07:00
John "Juce" Bruce
1e0e3e3a9f
am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
...
* commit '470fb26f7201e0f3161e5f0aea95743ad5d4aa11':
DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
2013-10-01 15:19:32 -07:00
John "Juce" Bruce
470fb26f72
am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
...
* commit '071f6998928ff2dbc0c5c3393f4ea9f0e6205ce9':
DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
2013-10-01 15:17:45 -07:00
John "Juce" Bruce
071f699892
DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
...
This updates the Widevine Classic libraries to version 4.5.0.10107.
This version backports the bugfix for the IPv6 issue from JB-MR2.
Also, the Widevine build system has been updated to support all six
flavors. (2 security levels x 3 instruction sets)
This change adds x86 L1 binaries and MIPS L3 binaries, as these have
been validated by partners.
Bug: 10246711
Change-Id: Ic0cf32ffd82fc8dacced84cecdee059afa1049ca
2013-10-01 15:12:21 -07:00
Fred Gylys-Colwell
7ac83679de
am e80df9e5: (-s ours) am fc913138: am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
...
* commit 'e80df9e55555d34385bfab29d40fd5f07ade16fd':
Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
2013-09-12 11:49:10 -07:00
Fred Gylys-Colwell
e80df9e555
am fc913138: am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
...
* commit 'fc913138ac362253fc559a9d414dc4d46c4d154f':
Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
2013-09-12 11:16:14 -07:00
Fred Gylys-Colwell
fc913138ac
am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
...
* commit '0b56285a624338a87f7759f73faa0cda44b42cfa':
Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
2013-09-12 11:12:59 -07:00
John "Juce" Bruce
67a83a22f7
DO NOT MERGE - Update Widevine Classic to 4.5.0.10107
...
This updates the Widevine Classic libraries to version 4.5.0.10107.
This version has identical functionality to the previous version,
however the version number has changed because the Widevine build
system has been updated to support all six flavors. (2 security
levels x 3 instruction sets)
This change adds x86 L1 binaries and MIPS L3 binaries, as these have
been validated by partners.
Bug: 10246711
Change-Id: Ie14e48aec33b0cc5d63752e24ba88284c6e37aa9
2013-08-28 12:03:42 -07:00
Jeff Tinker
6d93e43c3a
Part of fix for TEE resource leaks when app crashes
...
bug: 9672606
Merge of https://widevine-internal-review.googlesource.com/#/c/6531/
from the widevine CDM repository.
Change-Id: I8ed27cbd9944c3459fce251f1261f7656f99e277
2013-07-03 15:45:56 -07:00
Fred Gylys-Colwell
9fdeabe3ed
Update Widevine Modular DRM Integration Guide
...
The function OEMCrypto_LoadKeys should accept a null pointer for the
enc_mac_keys pointer. This indicates that the mac_keys are not being
updated. This CL just updates the documentation to clarify this behavior.
bug: 9549308
Change-Id: I1073e72f9c8d0fa712ad02e4c2d517202b3defab
2013-06-24 17:23:30 -07:00
Fred Gylys-Colwell
0b56285a62
Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
...
This change updates the Widevine binary libraries.
It includes the change:
Change name of DNS Server For Android Build
https://widevine-internal-review.googlesource.com/3322
Correct tool version for x86 jb-mr1 builds
https://widevine-internal-review.googlesource.com/3154
Update Build Script for Android
https://widevine-internal-review.googlesource.com/3340
Fixes to Jenkins build script for Android JBMR1 builds.
https://widevine-internal-review.googlesource.com/3551
Add Android property os.build.fingerprint to license request
https://widevine-internal-review.googlesource.com/3390
Bug: b/8173236
Bug: b/7594544 - Support x86 build on jbmr1
Bug: b/5425489
Change-Id: I6e32ab880c5768d724145d46a8b283bcdb2796ca
2013-06-24 21:17:43 +00:00
Jeff Tinker
47ef6eba62
Fix erroneous "format unsupported " error in Play Movies
...
Only the first 64K of the movie is pulled when sniffing,
if the widevine version metadata is not present in the
sniff buffer then a "format unsupported" error would occur.
This change increases the sniff buffer size to 128K.
bug: 9351294
Change-Id: If162cbea6915bf2b70122afd30e556e9206e8e43
2013-06-13 14:04:41 -07:00
Jeff Tinker
f2afd99431
Add Property for Provisioning ID
...
Adds a property that allows applications to get the provisioning-unique serial
number.
Bug: 9175567
Also fixes some missing mutexes that were causing intermittent failures in
calls to OEMCrypto due to concurrency issues.
Bug: 9175583
Merge of https://widevine-internal-review.googlesource.com/#/c/5831/
from the Widevine CDM repository
Change-Id: I1d7e3ca9f3b06da345022f5f0d64e0c17a5cedca
2013-05-30 11:55:25 -07:00
