Commit Graph

1819 Commits

Author SHA1 Message Date
Jeff Tinker
73cb652308 DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation.
am: eb9ea09db6

Change-Id: I5180b05591fe9bd96b0a7fea8dbddc3c601ee033
2017-01-09 16:10:47 +00:00
Jeff Tinker
eb9ea09db6 DO NOT MERGE Move legacy widevine classic global lock from framework to
vendor/widevine implementation.

This prevents a hang on contention for the lock if the datasource
read blocks during sniffing.

bug:28888414
Change-Id: I3568a36b9de10b7e977b19f2f6c66106ff784d01
2017-01-07 14:56:36 -08:00
John W. Bruce
8309a406b3 NYC-MR2 Widevine Version Number Bump
am: 1b298c6ec7

Change-Id: Ifa32ac7618652789acd9281cd5d2d9ba2eed8735
2017-01-06 02:01:00 +00:00
John W. Bruce
1b298c6ec7 NYC-MR2 Widevine Version Number Bump
(This is a merge of go/wvgerrit/22897)

Bumps the Widevine version to 4.2.0 for NYC-MR2 and also updates the
test to expect the NYC-MR2 OS version number.

Bug: 32955300
Test: request_license_test
Change-Id: I2f186928f20e0848cbeef5fef2182045ad27140a
2017-01-05 15:50:31 -08:00
Fred Gylys-Colwell
b6c6ac8d5b Merge "Level 3: Throw out keybox with wrong system id *DO NOT MERGE*" into nyc-mr2-dev
am: cc8d6942d6

Change-Id: Ic61e7cd16c98d108485c9d587f720056a7098244
2017-01-05 00:59:40 +00:00
Fred Gylys-Colwell
dddd1c738c Level 3: Throw out keybox with wrong system id *DO NOT MERGE*
am: 7e7ef2bb58

Change-Id: Iebd010ff1967ef6135cfa72862307de2c7c2f9cf
2017-01-05 00:59:39 +00:00
Fred Gylys-Colwell
cc8d6942d6 Merge "Level 3: Throw out keybox with wrong system id *DO NOT MERGE*" into nyc-mr2-dev 2017-01-05 00:55:39 +00:00
Aaron Vaage
f4e81ee21e Merge "[ OEMCrypto Profiler ] Removed Call Table" into nyc-mr2-dev
am: 37fc42c5b8

Change-Id: Ibbf96ea5b391278e810648290f785515aa73a352
2016-12-13 18:03:34 +00:00
Aaron Vaage
9ae9de59d4 [ OEMCrypto Profiler ] Removed Call Table
am: 4ad500d878

Change-Id: I52bc32fef3a70681c3443f6f862e1bee83bf17f2
2016-12-13 18:03:32 +00:00
Aaron Vaage
37fc42c5b8 Merge "[ OEMCrypto Profiler ] Removed Call Table" into nyc-mr2-dev 2016-12-13 17:41:19 +00:00
Rahul Frias
152629290b Merge "Address test network issues" into nyc-mr2-dev
am: f77df16bd5

Change-Id: I3d9410fc4a7bc5582996ee0c6335433e11a20559
2016-12-13 09:23:21 +00:00
Rahul Frias
939401861e Address test network issues
am: 3380679886

Change-Id: I0cadd9a2713f1614b3f4a97b234a1d065cb42425
2016-12-13 09:23:21 +00:00
Rahul Frias
f77df16bd5 Merge "Address test network issues" into nyc-mr2-dev 2016-12-13 09:18:10 +00:00
Fred Gylys-Colwell
7e7ef2bb58 Level 3: Throw out keybox with wrong system id *DO NOT MERGE*
This CL modifies the haystack code to throw out the keybox if the
system id is wrong.  This should help prevent b/33344450 from
persisting.

Part of this code change was to backport some updates to the haystack
tools on master.

arm/libwvlevel3.a  Level3 Library 4445 Dec  6 2016 16:58:47
x86/libwvlevel3.a  Level3 Library 4464 Dec  6 2016 17:06:21
mips/libwvlevel3.a  Level3 Library 4465 Dec  7 2016 13:36:32

b/33556871

Change-Id: I8dadf4bc7981af6afb970533df61d34b80d133a7
2016-12-12 16:11:08 -08:00
Aaron Vaage
4ad500d878 [ OEMCrypto Profiler ] Removed Call Table
This is a merge of go/wvgerrit/22627

The call table was meant to be a long-term way to track
the performance of all OEMCrypto function calls.

This feature does not get used. Apps that call into the
profiler can generate this from the history.

This change was designed to go into Android O
(go/wvgerrit/22503) but since the Call Table is causing problems
on specific chip sets its being removed in NYC MR2.

Bug: 33550032
Bug: 33459261
Change-Id: I2af417a32452e7d0d0a1ada8794efd849c497dc8
2016-12-12 15:05:07 -08:00
Rahul Frias
bd0fd7f4d2 Merge "Correct subsample flags in request_license_test" into nyc-mr2-dev
am: dab8aab4a8

Change-Id: Ie4a286555edce5ea249257f40f5338dadfa7fc72
2016-12-05 23:03:12 +00:00
Rahul Frias
541c9e632a Correct subsample flags in request_license_test
am: e7782c1e27

Change-Id: I7667fe5cd3ae42b72b5c65686bc9ae8f78fb61af
2016-12-05 23:03:12 +00:00
Rahul Frias
dab8aab4a8 Merge "Correct subsample flags in request_license_test" into nyc-mr2-dev 2016-12-05 22:58:51 +00:00
Rahul Frias
9e5f74eeba Release offline release sessions -- DO NOT MERGE
am: 9a55ca3249

Change-Id: If92d87a6d1cf98a786c72070122d7db68444be4f
2016-12-05 18:53:29 +00:00
Rahul Frias
9a55ca3249 Release offline release sessions -- DO NOT MERGE
[ Merge of http://go/wvgerrit/21960 ]

When an offline release message is generated, a session is created
internally to generate the release and handle the release response.
If the response is never provided (network, server errors),
or there is an error when the response is being processed, the
session may not be closed. This change introduces a time to live for
release sessions of 60 seconds and will be reclaimed after this period.

b/32223945

Change-Id: I3bd4637733ddf6c343956ed9f97c68d84dc7d4e4
2016-12-02 14:43:53 -08:00
Rahul Frias
e7782c1e27 Correct subsample flags in request_license_test
[ Merge of  http://go/wvgerrit/21980 ]

b/32487750

Change-Id: I5a3c3a768f3d1a81af4e8d897f68cfdbeb3526da
2016-12-01 11:17:59 -08:00
Rahul Frias
3380679886 Address test network issues
[ Merge of http://go/wvgerrit/22140 ]

There are occasional issues when trying to connect to
http://widevine-proxy.appspot.com/proxy . This changes introduces upto
3 retry attempts. The UAT server on appspot is being replaced by UAT on borg
and so it is not worth our while to debug these issues furthur.

b/30022298

Change-Id: I76c1421e93c7c14b5d2bcd7ad07119a705245922
2016-11-10 18:40:10 -08:00
John "Juce" Bruce
ef03c6795e Update Expected Version Number in Canary am: 2201d52b4c
am: 2cbe56b613

Change-Id: I8356adb3b46e1b137fd21a6594c34e2180527386
2016-10-19 23:47:17 +00:00
John "Juce" Bruce
2cbe56b613 Update Expected Version Number in Canary
am: 2201d52b4c

Change-Id: I237cf5e36eca0da53ea6507d4e8e1f070884b61d
2016-10-19 23:30:37 +00:00
John "Juce" Bruce
2201d52b4c Update Expected Version Number in Canary
(This is a merge of go/wvgerrit/21580)

The version number for N-MR1 has been increased to 7.1.1, which
triggered our version number canary. Since this is still N-MR1, no
Widevine version number update is necessary as we already updated it for
N-MR1, but the canary needs to be updated.

Bug: 32018966
Change-Id: Ia1d673f837d9c6a5935f26beec7372b25ea3a6b9
2016-10-19 13:36:01 -07:00
Edwin Wong
6c23b47497 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508 am: 2f58b776ff am: c71446e166
am: 8c259382b8

Change-Id: I54cf5fa260b6aec0cd66007feccce7421fb8881e
2016-09-23 00:42:54 +00:00
Edwin Wong
8c259382b8 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508 am: 2f58b776ff
am: c71446e166

Change-Id: I386bd00bf5e0aa5151ab9b9f001d01d1e94a9ee8
2016-09-22 23:40:12 +00:00
Edwin Wong
01b2534aec DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508
am: a46fb6b378

Change-Id: I20f503141af9d0348ded43089dd3ea911662afd2
2016-09-22 23:20:16 +00:00
Edwin Wong
c71446e166 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours am: 2ea811a508
am: 2f58b776ff

Change-Id: Ifa52d677cb2245f91e45108801a735f7e1b3f481
2016-09-22 21:58:14 +00:00
Edwin Wong
2f58b776ff DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours
am: 2ea811a508

Change-Id: If3714615668b5cad40782f5bff25e5e728633269
2016-09-22 18:09:03 +00:00
Edwin Wong
a46fb6b378 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884 am: 5b8ce1cd64 -s ours
am: 2ea811a508

Change-Id: I501c199f50fd8856c164bc74f7e38cd0b926477a
2016-09-22 13:14:16 +00:00
Edwin Wong
2ea811a508 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e am: 428a960884
am: 5b8ce1cd64  -s ours

Change-Id: Iffe795854a4cd89f5793746bb84d86ec3b38f2fc
2016-09-22 12:00:46 +00:00
Edwin Wong
5b8ce1cd64 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1 am: 5d4184e85e
am: 428a960884

Change-Id: If7ecda8b5c07d27da0bf66eb928da5a321890d6d
2016-09-22 11:58:03 +00:00
Edwin Wong
428a960884 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142. am: 0d1787e5a1
am: 5d4184e85e

Change-Id: I3788141d668dbfd0d3ede873f15589f08fd261bb
2016-09-22 08:14:08 +00:00
Edwin Wong
5d4184e85e DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
am: 0d1787e5a1

Change-Id: Ieb5d758c6061dc1d2fbaf78b6ab629064da0f5c7
2016-09-22 00:30:50 +00:00
Edwin Wong
0d1787e5a1 DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
Remove openssl external symbols from libssl.a and libcrypto.a.

Widevine repo reference:
https://widevine-internal-review.googlesource.com/#/c/17990/
https://widevine-internal-review.googlesource.com/#/c/18004/

bug: 28013024
Change-Id: I8a6dd5a17f896a65da8209680ef200a953b21e80
2016-09-19 15:17:46 -07:00
Fred Gylys-Colwell
4354c9182a Pull cache flush out of Haystack am: 84d7185e5f
am: 6304a242ae

Change-Id: I31e77cbedbf877b82ab5e444f095030433b8fa28
2016-09-12 17:17:02 +00:00
Fred Gylys-Colwell
6304a242ae Pull cache flush out of Haystack
am: 84d7185e5f

Change-Id: I1e477c7ed114b97a5fa3d9cccb0bbb427cce2a56
2016-09-12 17:13:32 +00:00
Fred Gylys-Colwell
84d7185e5f Pull cache flush out of Haystack
Merge of http://go/wvgerrit/20924

This CL pulls the cache flush code out of the haystack code and into
the adapter level.  This is so it will be built with processor
specific compiler flags instead of as part of the precompiled binary.

level3/mips/libwvlevel3.a  Level3 Library 4465 Sep 10 2016 21:44:37
level3/arm/libwvlevel3.a  Level3 Library 4445 Sep 10 2016 21:30:01
level3/x86/libwvlevel3.a  Level3 Library 4464 Sep 10 2016 21:49:53

b/30550782 Battery Problems

Change-Id: I8967da498a43cabe82e78345162705dc2fcdb859
2016-09-10 21:55:52 -07:00
Fred Gylys-Colwell
dfd6df5cf9 Don't Increment IV for Partial Blocks in Unit Tests am: 3f040e0a9d
am: 4b380dfb1b

Change-Id: Icd56b2b88a9efda4e5ed6167edc7cfd35472167d
2016-09-07 18:42:50 +00:00
Fred Gylys-Colwell
4b380dfb1b Don't Increment IV for Partial Blocks in Unit Tests
am: 3f040e0a9d

Change-Id: I394b1a905ef15ab1f2160d9340d6b92f4d377fdc
2016-09-07 18:39:50 +00:00
Fred Gylys-Colwell
3f040e0a9d Don't Increment IV for Partial Blocks in Unit Tests
Merge from widevine repo of http://go/wvgerrit/20660

For CTR encryption mode, when a subsample ends with partial block that
is continued on the next subsample, both blocks should have the same
IV.  This allows an implementation of OEMCrypto to optimize their
decryption algorithm.

b/31114392

Change-Id: I29a998b00f3bfb12c4bbbcb1fa1ebc371473fefd
2016-09-02 15:51:05 -07:00
John Bruce
bfa2f87268 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev am: 3fbc2106d8
am: d649905cd6

Change-Id: I28ca4e390cf3bc31bea860c8b52ca292f55ca1a1
2016-09-02 20:18:02 +00:00
John "Juce" Bruce
3778d8218a Widevine Version Number for NYC-MR1 am: 15ca8148a8
am: 08a706f1b0

Change-Id: Ifb971fe3afc80865403b1fbed9408c10a14971cb
2016-09-02 20:18:02 +00:00
John Bruce
d649905cd6 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev
am: 3fbc2106d8

Change-Id: I910b131db94dd9764bda98019fe37c4569172900
2016-09-02 20:15:01 +00:00
John "Juce" Bruce
08a706f1b0 Widevine Version Number for NYC-MR1
am: 15ca8148a8

Change-Id: I6faba922cc7b02cf4e2a7a274cdd554bc294deb1
2016-09-02 20:15:01 +00:00
John Bruce
3fbc2106d8 Merge "Widevine Version Number for NYC-MR1" into nyc-mr1-dev 2016-09-02 20:09:55 +00:00
John Bruce
10236f49fd Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev am: bf53608a4e
am: 73a39a6551

Change-Id: I26e2c39509e9c2b4b139da80a4280c72766a54b7
2016-08-29 21:31:34 +00:00
John "Juce" Bruce
67682ddf1a Fix cens Mode in Android CDM am: e0f4942b8f
am: 442099fb15

Change-Id: I978356e4982b83a3f343bb025fbeb5b33daee44f
2016-08-29 21:31:34 +00:00
John Bruce
73a39a6551 Merge "Fix cens Mode in Android CDM" into nyc-mr1-dev
am: bf53608a4e

Change-Id: Icc3ec03853cbb4472d3894e2e339fcfcbb37051b
2016-08-29 21:24:27 +00:00