Kyle Alexander
0b450d7114
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours am: 7a7b7e1192 -s ours
...
am: 143637f463
2015-12-18 21:07:19 +00:00
Kyle Alexander
143637f463
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours am: 168c9bec9b -s ours
...
am: 7a7b7e1192
2015-12-18 21:04:39 +00:00
Kyle Alexander
7a7b7e1192
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours
...
am: 168c9bec9b
2015-12-18 21:01:44 +00:00
Kyle Alexander
168c9bec9b
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours
...
am: b7be833e68
2015-12-18 20:59:05 +00:00
Kyle Alexander
b7be833e68
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours
...
am: 0c660f33ef
2015-12-18 20:56:56 +00:00
Kyle Alexander
0c660f33ef
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours
...
am: 62c9688118
2015-12-18 20:54:33 +00:00
Kyle Alexander
62c9688118
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours
...
am: 4d84216089
2015-12-18 20:46:30 +00:00
Kyle Alexander
4d84216089
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours
...
am: 12c6b681e5
2015-12-18 20:44:32 +00:00
Kyle Alexander
12c6b681e5
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours
...
am: b58de75756
2015-12-18 20:42:43 +00:00
Kyle Alexander
b58de75756
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours
...
am: e525aad042
2015-12-18 20:40:32 +00:00
Kyle Alexander
e525aad042
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
...
am: 99941b86b6
2015-12-18 20:38:36 +00:00
Aaron Vaage
20cec67597
Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours
...
am: 83ac4b052f
2015-12-16 14:16:07 -08:00
Aaron Vaage
83ac4b052f
Updating asset names link in sample player readme DO NOT MERGE am: ba25949152
...
am: 032652fa0f
2015-12-16 22:11:14 +00:00
Aaron Vaage
032652fa0f
Updating asset names link in sample player readme DO NOT MERGE
...
am: ba25949152
2015-12-16 22:06:33 +00:00
Aaron Vaage
72618085fc
Updating asset names link in sample player readme DO NOT MERGE
...
am: 62c80f89ba
2015-12-16 22:06:32 +00:00
Kyle Alexander
99941b86b6
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
...
Based from Widevine cl:
https://widevine-internal-review.googlesource.com/#/c/16322/
Bug: 26046529
Change-Id: Ib8a4fd1588de35a02973bca1914a298a62a71f7c
2015-12-15 17:46:18 +00:00
Aaron Vaage
ba25949152
Updating asset names link in sample player readme DO NOT MERGE
...
bug: 25673423
Change-Id: Ic394701da976371bbd2cb68074c3473f803624e6
2015-12-09 23:24:07 +00:00
Aaron Vaage
62c80f89ba
Updating asset names link in sample player readme DO NOT MERGE
...
bug: 25673423
Change-Id: I9fc07f9d65237f0906f97eff6bce47672e38dde3
2015-12-09 23:23:21 +00:00
John "Juce" Bruce
c2ce8f974f
Update Widevine Android Version Number for M-MR1 (DO NOT MERGE)
...
This updates Widevine's version number (and our canary test) for
M-MR1. Widevine will report its version as 3.1.0 instead of 3.0.0,
in order to distinguish it from the version released with Android M.
Bug: 25297264
Change-Id: I79c53b2d1a63753bce2aa5a77c46543c2804d95e
2015-10-28 01:06:55 +00:00
Edwin Wong
d1b284b21c
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7
...
am: c37606b47b
2015-10-20 04:59:31 +00:00
Edwin Wong
90d6be0170
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a
...
am: fdc1ab381d
2015-10-20 04:59:28 +00:00
Edwin Wong
c37606b47b
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173
...
am: 3efbeb28d7
2015-10-20 04:57:44 +00:00
Edwin Wong
fdc1ab381d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09
...
am: a69baa961a
2015-10-20 04:57:41 +00:00
Edwin Wong
3efbeb28d7
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82
...
am: 3b3b609173
2015-10-20 04:31:52 +00:00
Edwin Wong
a69baa961a
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2
...
am: 4c2eb98d09
2015-10-20 04:30:09 +00:00
Edwin Wong
3b3b609173
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e
...
am: de6d223b82
2015-10-20 04:28:23 +00:00
Edwin Wong
4c2eb98d09
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989
...
am: fc1240bdc2
2015-10-20 04:26:43 +00:00
Edwin Wong
de6d223b82
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392
...
am: 10b2b36a1e
2015-10-20 04:26:42 +00:00
Edwin Wong
10b2b36a1e
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc
...
am: 2253f6c392
2015-10-20 04:24:53 +00:00
Edwin Wong
fc1240bdc2
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0
...
am: ac1854b989
2015-10-20 04:24:53 +00:00
Edwin Wong
2253f6c392
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68
...
am: 1afb1066cc
2015-10-20 04:23:06 +00:00
Edwin Wong
ac1854b989
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d
...
am: 2ee45a97b0
2015-10-20 04:23:06 +00:00
Edwin Wong
2ee45a97b0
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1
...
am: d5a1d5d58d
2015-10-20 04:21:24 +00:00
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
Fred Gylys-Colwell
8f47dd6215
am a57b5cf8: (-s ours) am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit 'a57b5cf88b70a04abe2334a612ddc53e557d6419':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:31:19 +00:00
Fred Gylys-Colwell
a57b5cf88b
am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit '4d34e02b86a37aaf3c1630618d4a0b91ff1fc709':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:28:19 +00:00
Fred Gylys-Colwell
4d34e02b86
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
This is a documentation change only.
Merged from widevine repo of http://go/wvgerrit/15737
This CL updates the docs for OEMCrypto to clarify that HDCP v2.2
should be type 1. The document version number is rolled to 9.1.
See Version 9 copy of original document for version history:
https://docs.google.com/document/d/1hiZ7wsZ_IkL5GvmjaUx3wffs8mI0xsfHZ6f9J-BOaC8/edit#
bug: 24098055
Change-Id: I084d86e44c60a5810fa448364003f7464e30bfb2
2015-10-01 20:27:10 +00:00
Fred Gylys-Colwell
7858372033
Clarify HDCP Type (mnc-dev branch)
...
Merge from widevine repo of http://go/wvgerrit/15735
This is a documentation only change.
This CL updates the docs for OEMCrypto to clarify that HDCP v2.2
should be type 1. The document version number is rolled to 10.3.
See original document for version history:
https://docs.google.com/document/d/1pHSJ2IKL0axmQz2gmDZ7olxPWb_ZcULaJrYwDZAeS7k/edit#
bug: 24098055
Change-Id: If2dd677cd824482ab18eeed03a335d7b82adbcbe
2015-09-23 17:16:14 -07:00
Rahul Frias
25a6185c84
Address releaseAllSecureStops crash
...
[ Merge of http://go/wvgerrit/15474 ]
Changes to releaseAllSecureStops made use of a session that was
initialized only if getSecureStops had been previously called. If it was not,
accessing the session resulted in a segfault. This was uncovered by a change
in how the Netflix app invoked mediaDrm.
b/23498809
Change-Id: Ib426ae1830c3a42c5e0849f1b6e8bbfe0d2c74ff
2015-08-25 10:40:12 -07:00
Jeff Tinker
6a7d526def
am c48fedc1: (-s ours) am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit 'c48fedc14cb0a47bc99db89faf9b875525cd5fab':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 17:01:59 +00:00
