Edwin Wong
4135a57feb
am e024bb54: am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit 'e024bb545b0a0f06b6cbac6c14c16f596cae8493':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:19:42 +00:00
Edwin Wong
e024bb545b
am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '5b57acc12a7cef04666ed19ac6e96d2921813c85':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:15:26 +00:00
Edwin Wong
5b57acc12a
am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit 'f22b980716b187db673c0265acd73a1f315a374d':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:10:59 +00:00
Edwin Wong
f22b980716
am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '7fd923422615646d94f1fa7a6dbf5a8749531258':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:06:19 +00: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
dbcacddb15
am 5cf6ceea: am 778f0d81: am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '5cf6ceea61f693cc31699dc5a680abd898efa48f':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-09 00:20:39 +00:00
Edwin Wong
5cf6ceea61
am 778f0d81: am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '778f0d814724da5fda04353a38cc879cf56c503a':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-09 00:17:40 +00:00
Edwin Wong
778f0d8147
am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '91a5fce49a212cb8b11f6d6bff8e812390135e57':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-09 00:14:41 +00:00
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
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
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
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
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
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
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
ebce9a58de
am 7eb1a295: am 77fcf29b: am 35c8fc94: 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 '7eb1a295106c98308ee57f9006f768d280b56578':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:30:20 +00:00
Edwin Wong
7eb1a29510
am 77fcf29b: am 35c8fc94: 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 '77fcf29b157da9c26d2a9cec14e01eca214d544f':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:26:19 +00:00
Edwin Wong
77fcf29b15
am 35c8fc94: 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 '35c8fc94708ea1a476014035b66d372051d509db':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:23:11 +00: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
d875310a76
am d3e06ad1: am eafc65e7: resolved conflicts for merge of 65a35c7d to klp-dev
...
* commit 'd3e06ad1e5b58b4d81c5e465d753fc6e08fc8273':
Update DASH demo player for OEMs
2014-04-05 00:36:55 +00:00
Jeff Tinker
d3e06ad1e5
am eafc65e7: resolved conflicts for merge of 65a35c7d to klp-dev
...
* commit 'eafc65e79459497a0890776b968e7ac64ab8197d':
Update DASH demo player for OEMs
2014-04-05 00:31:28 +00:00
Jeff Tinker
eafc65e794
resolved conflicts for merge of 65a35c7d to klp-dev
...
Change-Id: If8f3ff6b3f638038da57fde85edee982f7ef8144
2014-04-04 15:48:47 -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
Jeff Tinker
f9b1a2e1f1
Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
2014-04-03 01:30:44 +00:00
Jeff Tinker
aaf4427950
Add signature|system permission to MediaDrm signer APIs
...
Update test to require the system permission
Merge of https://widevine-internal-review.googlesource.com/#/c/9652
from the Widevine cdm repo.
Change-Id: I071e55f09f85c420e6778ebf170f5110cf39809e
related-to-bug: 12702350
2014-04-02 23:41:12 +00:00
