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

3981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
063db9cf02 Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67 
Change-Id: I1fee67f9cf299d5c6b482f9aebae04edd481c853
 2020-05-27 21:59:20 +00:00
Alex Dale
32f70b0464 Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619 
Change-Id: I80383dcc06a4ca5a2b7854e3f8075a7f0d97cdea
 2020-05-27 21:59:14 +00:00
Alex Dale
e8cfec7c67 Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 
Change-Id: I66a5a56e3c11a86f82e920d20e309c852d3179e8
 2020-05-27 21:44:10 +00:00
Alex Dale
7eb1c2b619 Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c 
Change-Id: Idc9fe4cee6699c6d35c828f4c4fa0075f3ccfaa2
 2020-05-27 21:44:02 +00:00
Alex Dale
3316ea8c53 Rolled expected version number for R. am: dd70d63b76 
Change-Id: I0e80a32a474d0e0229ef3b1f73ff06c4f60d785f
 2020-05-27 21:25:03 +00:00
Alex Dale
9329bf331c Rolled expected version number for R. am: dd70d63b76 
Change-Id: Id8ddfa7e676b57eb0ab8261d166dd0cf8901a458
 2020-05-27 21:24:39 +00:00
Alex Dale
dd70d63b76 Rolled expected version number for R. 
[ Merge of http://go/wvgerrit/100403 ]

VersionNumberTest.VersionNumberChangeCanary was expecting a version
string of "R".  However, Android rvc branch is now far enough into
development to use a numbered version: version "11".

Bug: 156853733
Test: Android license request test
Change-Id: I63d33f742c849b672b2d2402ab8423fdf2450f6f
 2020-05-27 17:27:46 +00:00
TreeHugger Robot
97ce58fdb6 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9 
Change-Id: I70bba32884ed67ad8a798e7d50b5deddc6541966
 2020-05-27 04:36:25 +00:00
Automerger Merge Worker
f426b9a654 Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp am: a0eb7bfe04 
Change-Id: Ifb4bb6af113f2adf2e0e8069652979b9c0e6eb40
 2020-05-27 04:36:20 +00:00
TreeHugger Robot
abb27ddfcd Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca 
Change-Id: Ie1beabec62bfadfdce6b823c457f98494fcb13fa
 2020-05-27 04:36:01 +00:00
TreeHugger Robot
743f9971b8 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2 
Change-Id: Ie35b9c9c53204a75be5603a3e4f09d3f972415f1
 2020-05-27 04:35:53 +00:00
TreeHugger Robot
5c24259ece Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 55a8c8742a 
Change-Id: I00d6da020ac8817145e70961098f12cde0856c20
 2020-05-27 04:35:37 +00:00
TreeHugger Robot
2379c7664a Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc 
Change-Id: I0fbddc068937bece40ab08ee99c73133b3ccb81d
 2020-05-27 04:35:28 +00:00
TreeHugger Robot
549a259ef9 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e 
Change-Id: I3a1441864c20a2aa34363ad29604b9af94e4dce1
 2020-05-27 04:17:38 +00:00
Automerger Merge Worker
a0eb7bfe04 Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp 2020-05-27 04:17:36 +00:00
TreeHugger Robot
2308e673b2 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad 
Change-Id: I2750207868d9444d83a627882d2c80d70767935a
 2020-05-27 04:17:35 +00:00
TreeHugger Robot
e3a6cee1ed Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b 
Change-Id: I1eddafa565b76b571a54dfacb96e02b8049cdc33
 2020-05-27 04:17:33 +00:00
TreeHugger Robot
fbd9ca7eca Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad 
Change-Id: I0114b7dd12054575199c5eeb021617842f1d5b4a
 2020-05-27 04:17:32 +00:00
TreeHugger Robot
55a8c8742a Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e 
Change-Id: I78b3ed5fd43578fe750630d37ae774a871846d00
 2020-05-27 04:17:20 +00:00
TreeHugger Robot
3889252bfc Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e 
Change-Id: I174696645e9885044023ad9177fcc6780d928178
 2020-05-27 04:17:20 +00:00
TreeHugger Robot
a22fc9fa8e Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c 
Change-Id: Ifdefc4babbdef591b73c0afb7a76035148657523
 2020-05-27 04:00:57 +00:00
TreeHugger Robot
5bedd9c4ad Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c 
Change-Id: I992d0c2d9da83a6d192a019b1fca2c1b774bad92
 2020-05-27 04:00:54 +00:00
TreeHugger Robot
089fe5d90b Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b 
Change-Id: If61e903fb3b32cb9cf610511c07585eeb942f157
 2020-05-27 04:00:28 +00:00
TreeHugger Robot
208a088e8e Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b 
Change-Id: I9e2aadbdbfa628e5987df9ea780c85f8a64e7b86
 2020-05-27 04:00:22 +00:00
TreeHugger Robot
bd8e573e0c Merge "The Entitlement key map was not being cleaned up." into rvc-dev 2020-05-27 03:43:48 +00:00
TreeHugger Robot
7534d9795b Merge "Start playback timer in integration tests" into rvc-dev 2020-05-27 03:43:30 +00:00
Fred Gylys-Colwell
56995ca921 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 88ef970b90 
Change-Id: Ied69efdc62e1b7cb07e41ca8d587f106191023b5
 2020-05-21 22:54:57 +00:00
Fred Gylys-Colwell
7e11f1c992 Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122 am: 0a165bbf44 
Change-Id: I273a55182d02bf1e3ce922dc481f5b84cee96324
 2020-05-21 22:54:25 +00:00
Fred Gylys-Colwell
40e2e7fa08 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 51cf7e4668 
Change-Id: I5e835996ad9f0290572d3da4c2106a4e5739c790
 2020-05-21 22:54:18 +00:00
Fred Gylys-Colwell
0a165bbf44 Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122 
Change-Id: Ia251d06305a373715303be4c315401552e8d44f9
 2020-05-21 22:41:23 +00:00
Fred Gylys-Colwell
88ef970b90 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d 
Change-Id: I3cb29d5429ba53accf3709303df2f59cd2ef86f7
 2020-05-21 22:41:21 +00:00
Fred Gylys-Colwell
51cf7e4668 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d 
Change-Id: Ifc0acc1b95a25f071bafdaf6474bdadfe594a483
 2020-05-21 22:41:00 +00:00
Fred Gylys-Colwell
d22ef11122 Update TimeRollbackPrevention unit test am: 75575418d0 
Change-Id: I1a0345208fcbce3a03798d9641725a67f218ea6f
 2020-05-21 22:29:15 +00:00
Fred Gylys-Colwell
7cd14be01d Update TimeRollbackPrevention unit test am: 75575418d0 
Change-Id: I3c6e54676e35581d0dfa255e230b7b4094f783bb
 2020-05-21 22:29:14 +00:00
Fred Gylys-Colwell
75575418d0 Update TimeRollbackPrevention unit test 
Merge from Widevine repo of http://go/wvgerrit/100110

The unit test TimeRollbackPrevention was broken for several
reasons. This CL reduces the test to its most basic functionality and
updates it to be compatible with a v16 oemcrypto.

This CL also adjusts the fake clock used by the buildbot to fake
sleeping backwards, so that the TimeRollbackPrevention test can also
be run on the buildbot.

Bug: 155773482
Bug: 79422351
Test: unit tests on buildbot, and on flame w/v16 modmock
Change-Id: I3027018b17b738281989e63ae6b0729757217d05
 2020-05-20 13:47:28 -07:00
Fred Gylys-Colwell
e9dfca1219 The Entitlement key map was not being cleaned up. 
Merge from Widevine repo of http://go/wvgerrit/100385

The map now contains unique_ptr instead of raw pointers
to ensure the memory is released.

Bug: 156780432 OEMCrypto Fuzzing: Fix OEMCrypto Memory Leak.
Test: oemcrypto reference code only
Change-Id: I78054f9207399f052d6e4bfdfa96824f6e050bac
 2020-05-19 10:58:05 -07:00
Fred Gylys-Colwell
f6229788b0 Start playback timer in integration tests 
Merge from Widevine repo of http://go/wvgerrit/100328

Several integration tests in WvCdmRequestLicenseRollbackTest had been
testing the duration of a license. However, the license they request
sets the playback duration and not the rental duration. That means the
timer we are checking does not start until the first playback. To fix
the tests, we simply add a decrypt operation right after the license
is received.

Test: integration tests w/v16 mod mock.
Bug: 156854660
Change-Id: Ie4f017c82db8aaf084ad050de3fcb7f51987c97e
 2020-05-18 20:57:41 +00:00
Fred Gylys-Colwell
460d045c59 License release does not use core message am: 760bf71908 am: 75cae91c79 am: 7ed988ef1f 
Change-Id: Ia60667ed4ee82d3b357b9b276dcc1bef755847df
 2020-05-14 22:22:55 +00:00
Automerger Merge Worker
c5faf0c749 Merge "License release does not use core message am: 760bf71908 am: 98ca694dcd am: 4c61d20ab1" into rvc-qpr-dev-plus-aosp 2020-05-14 22:22:38 +00:00
Fred Gylys-Colwell
0d792297b5 License release does not use core message am: 760bf71908 am: 98ca694dcd am: fa074ccc04 
Change-Id: I1d0e0ec4fbc9243caeaf4d80cc0804f865961258
 2020-05-14 22:22:33 +00:00
Fred Gylys-Colwell
180627a34d License release does not use core message am: 760bf71908 am: 98ca694dcd am: 4c61d20ab1 
Change-Id: I5d9a952587e16fe5a6cd12bcce8d20283c1b4e73
 2020-05-14 22:22:28 +00:00
Fred Gylys-Colwell
7ed988ef1f License release does not use core message am: 760bf71908 am: 75cae91c79 
Change-Id: I1aedd3a72479940d8a35d96f13e3c91031abf712
 2020-05-14 22:05:45 +00:00
Fred Gylys-Colwell
fa074ccc04 License release does not use core message am: 760bf71908 am: 98ca694dcd 
Change-Id: I303f3b4d8893f9d99f34f7db118588a7c433ed25
 2020-05-14 22:05:22 +00:00
Fred Gylys-Colwell
4c61d20ab1 License release does not use core message am: 760bf71908 am: 98ca694dcd 
Change-Id: I08a2f7065da8b9f8dada01ff241a3585a91fa889
 2020-05-14 22:05:19 +00:00
Fred Gylys-Colwell
75cae91c79 License release does not use core message am: 760bf71908 
Change-Id: I5c941e7813b880684b344e56fa84f01c2d0ca97f
 2020-05-14 21:45:15 +00:00
Fred Gylys-Colwell
98ca694dcd License release does not use core message am: 760bf71908 
Change-Id: Ief5646322d0311f44d9b1040bda5200fdfe76cee
 2020-05-14 21:45:15 +00:00
Fred Gylys-Colwell
760bf71908 License release does not use core message 
Merge from Widevine repo of http://go/wvgerrit/99843

When processing a license release, the license is not loaded, so
OEMCrypto does not know nonce version information for the core
message. It assumes that all license releases are v15, so it is not an
error for a license release to not have a core message.

This CL also adds some extra logging to tests so that we can track
content id and the pssh. This CL also updates some of the test content
policies when running the local license server. The local license
server is only used for debugging problems.

Bug: 152648172 Integration test WvCdmEngineTest.LicenseRenewal failing
Bug: 156259697 License release does not need core message
Test: Unit tests with v16 mod mock
Change-Id: I04c896adadfb17877ce1115345d2419e0d2489f0
 2020-05-13 21:22:43 +00:00
Alex Dale
3fc0009ec4 Update AddEntry() for usage table changes. am: 66e3d69300 am: 4c97abd57a am: 616b9a8489 am: 1f8f907e23 
Change-Id: I6abf3a876521018dbe4212d2fe579986c42b2aae
 2020-05-01 02:12:16 +00:00
Alex Dale
4468261953 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 51f5315a62 am: 41ed193982 am: 5f268e3508 
Change-Id: I2ec7c3da21f9ff692d77ddb017b48e76c082962e
 2020-05-01 02:12:14 +00:00
Alex Dale
0c6ef193dd Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 44cc2500b3 am: 9e0e33244c am: e89b38d75f 
Change-Id: I75e18a36f7484a14676f8e16286063b1ac04bffd
 2020-05-01 02:12:10 +00:00