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

1478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Alexander
d0e006f7b5 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 -s ours am: 0b450d7114 -s ours 
am: 69d90c3c07  -s ours

* commit '69d90c3c07530dd22361e890633098707d4892c0':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 2015-12-18 21:31:34 +00:00
Kyle Alexander
69d90c3c07 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 -s ours 
am: 0b450d7114  -s ours

* commit '0b450d7114ba7c7b0aeaa9fb09ba536fc84e385a':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 2015-12-18 21:09:15 +00:00
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  -s ours

* commit '143637f463bd691ff830db5a28342cf377eeb2bf':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit '7a7b7e1192632fce356948600ed38599cc77d728':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit '168c9bec9ba8dc8a955f4bef56fc51f6a54b54e6':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit 'b7be833e68e55470f8af317a856d6714e10de547':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit '0c660f33efe62765253b783357defad1a1f11b55':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit '62c9688118d22f868d8792b772bffc8f6b19b661':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit '4d84216089f43d544d8f645566008cbe2773dc9e':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit '12c6b681e54493ab27388dee09b0925abdc2cd40':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit 'b58de757563fca92eb1e610abb345beab44c62de':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit 'e525aad0429d7c3af4e700c59974212d99473d98':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 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  -s ours

* commit '99941b86b6c413a21d7850423a1d83105aa0e471':
  DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
 2015-12-18 20:38:36 +00:00
Aaron Vaage
220d45baa0 Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours am: 83ac4b052f am: 20cec67597 
am: e55e341dd0

* commit 'e55e341dd025011b7072c93eae5cbd80c8ba1677':
  Updating asset names link in sample player readme DO NOT MERGE
 2015-12-16 22:53:46 +00:00
Aaron Vaage
e55e341dd0 Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours am: 83ac4b052f 
am: 20cec67597

* commit '20cec675979ed7584d0fb0f117aef0ab262041ac':
  Updating asset names link in sample player readme DO NOT MERGE
 2015-12-16 22:36:31 +00:00
Aaron Vaage
d7d30f75bd Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba am: 72618085fc 
am: 313f07a1b9

* commit '313f07a1b9ab54114ea54c4efea31e9dd311adf9':
  Updating asset names link in sample player readme DO NOT MERGE
 2015-12-16 14:32:41 -08:00
Aaron Vaage
313f07a1b9 Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba 
am: 72618085fc

* commit '72618085fcc6c3873da51a197d687593a02df4b8':
  Updating asset names link in sample player readme DO NOT MERGE
 2015-12-16 22:20:19 +00:00
Aaron Vaage
20cec67597 Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours 
am: 83ac4b052f

* commit '83ac4b052f6f9f093d19b75c68cc6e4be8d354c8':
  Updating asset names link in sample player readme DO NOT MERGE
 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  -s ours

* commit '032652fa0f4f2c52d71ef47fe2e5f4c7dac85a9f':
  Updating asset names link in sample player readme DO NOT MERGE
 2015-12-16 22:11:14 +00:00
Aaron Vaage
032652fa0f Updating asset names link in sample player readme DO NOT MERGE 
am: ba25949152

* commit 'ba259491525a2568fe2cf0eed773e5092d5c5b67':
  Updating asset names link in sample player readme DO NOT MERGE
 2015-12-16 22:06:33 +00:00
Aaron Vaage
72618085fc Updating asset names link in sample player readme DO NOT MERGE 
am: 62c80f89ba

* commit '62c80f89bafd50d2b3c0a94559c553d20808a3f6':
  Updating asset names link in sample player readme DO NOT MERGE
 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
Tim Kilbourn
841aa35591 Rename the internal copy of gmock. 
am: 2b2337bb3c

* commit '2b2337bb3ca9df2e96b200bd6fe090e361b6c367':
  Rename the internal copy of gmock.
 2015-11-19 23:01:10 +00:00
Tim Kilbourn
2b2337bb3c Rename the internal copy of gmock. 
The external/gmock project does not include the patches needed for
widevine, so renaming the internal copy allows both to coexist in the
build system.

(cherry-pick of commit 5b830f19b6)

Change-Id: Id41a6b3f43b83054a979471309200471f41a45ed
 2015-11-17 17:29:52 +00:00
John "Juce" Bruce
51468fd612 Update Widevine Android Version Number for M-MR1 (DO NOT MERGE) 
am: c2ce8f974f

* commit 'c2ce8f974ffe45dd8af2b4e35480ea5f6646b816':
  Update Widevine Android Version Number for M-MR1 (DO NOT MERGE)
 2015-10-28 19:38:03 +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
220816c7e2 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 
am: d1b284b21c

* commit 'd1b284b21c86b7199e85ad1b63a8d4aa4bcbef3e':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 2015-10-20 05:06:43 +00:00
Edwin Wong
21f2393af0 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 
am: 90d6be0170

* commit '90d6be017068624bd6b7d8deadc4cc07585531df':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 2015-10-20 05:06:40 +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

* commit 'c37606b47bda3c955de689a33b3934a66f74b173':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit 'fdc1ab381d3c86befa2a7dc2f8afead4fa57f35d':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit '3efbeb28d7afc342f763cedab2d2d08e511a2849':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit 'a69baa961a30f88e978580b2b62894b2370db560':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit '3b3b60917361b28e3812aa60bd7345d399984961':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit '4c2eb98d0991c8f3b0002bf13d350a8ce6b8a278':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit 'de6d223b82af5c5643cfc9f11745a830fd067b57':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit 'fc1240bdc2008ce28aca3f1f2f2c13ed1a8bab4c':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit '10b2b36a1eba2bd8d1de0a6dadb0fb6df3be4c01':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit '2253f6c392de69b9f0d10ed92170f96c2169085b':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit 'ac1854b9899a099d83dd2f2eecd7e0cc5ae285be':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit '1afb1066cca307559d2b67e6b8fad28ad335f3ff':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit '2ee45a97b06ba41ffc663b69ecb6b22547577258':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit 'd5a1d5d58deaf2a226ec6981db5b3be79dc6e2e6':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit 'ee415b7b681e36e157be49e437797153887347bb':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit '5754438dc1ce01849b9faa910dec7a32b5b8e086':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit '94dab9e9051905b268eec5aede093482f0d5bc95':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 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

* commit '9617db4d71ed795f0733c4e02d56d625b576f158':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
 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

* commit '655574d96893b9a920253efb2f3a9a0bf6052593':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 2015-10-20 04:11:35 +00:00
Edwin Wong
655574d968 resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d 
am: 27133e7a03

* commit '27133e7a032140cbe2d2eb492a18e1f4c8af67cd':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
 2015-10-20 04:08:24 +00:00