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

3944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Dale
3804200ddf Update AddEntry() for usage table changes. am: 66e3d69300 am: 0a7e070618 am: aebce2017d 
Change-Id: I7571be1f75859dfe1c6bc9ad6886b25a6463cc06
 2020-05-01 01:57:59 +00:00
Alex Dale
58bcf2e370 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 4793f1f1b3 am: 6088db2efa 
Change-Id: I06bdbef715022fed7c6e6cb0931465639cd034e4
 2020-05-01 01:57:56 +00:00
Alex Dale
9c3d5ff0d6 Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 49458c55d1 am: 5f944c1602 
Change-Id: I5c0b42ed3428058c9b6bce1f999d760e686a7fc3
 2020-05-01 01:57:55 +00:00
Alex Dale
1f8f907e23 Update AddEntry() for usage table changes. am: 66e3d69300 am: 4c97abd57a am: 616b9a8489 
Change-Id: Ie90936fe1e0a8ad268208a90f6500851829fbfa2
 2020-05-01 01:57:41 +00:00
Alex Dale
5f268e3508 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 51f5315a62 am: 41ed193982 
Change-Id: I10f31db405bf622ee6b7c4fc82790b3190f57c1d
 2020-05-01 01:57:40 +00:00
Alex Dale
e89b38d75f Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 44cc2500b3 am: 9e0e33244c 
Change-Id: Ie68f666c1072635dc7df22b38b18b0096aceaff7
 2020-05-01 01:57:39 +00:00
Alex Dale
7c56669a4f Update AddEntry() for usage table changes. am: 66e3d69300 am: 4c97abd57a am: c15d453a9d 
Change-Id: Ia8e996d1193cfabf99d854fee6e3f0eefcced1e5
 2020-05-01 01:57:09 +00:00
Alex Dale
a2dace6651 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 51f5315a62 am: 069de13b94 
Change-Id: I603ab32a265f409fb666024778e083066d82479d
 2020-05-01 01:57:08 +00:00
Alex Dale
770e8a929f Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 44cc2500b3 am: 5558f13d57 
Change-Id: Ib25887b0a3111971813b518b4cbb9d0563a9a59f
 2020-05-01 01:57:06 +00:00
Alex Dale
aebce2017d Update AddEntry() for usage table changes. am: 66e3d69300 am: 0a7e070618 
Change-Id: I9ea504a397e2a8fb72deeb88ab0a2ed350ad3b0b
 2020-05-01 01:38:43 +00:00
Alex Dale
6088db2efa Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 4793f1f1b3 
Change-Id: I3725b256afaf7d402ff0a903cdb54c42379f38cb
 2020-05-01 01:38:42 +00:00
Alex Dale
5f944c1602 Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 49458c55d1 
Change-Id: I7807c0cb554c18fbccea33b9946feca9dae60b26
 2020-05-01 01:38:42 +00:00
Alex Dale
c15d453a9d Update AddEntry() for usage table changes. am: 66e3d69300 am: 4c97abd57a 
Change-Id: I01ab56cc902d455d2827af70e54ee57870a52be0
 2020-05-01 01:38:03 +00:00
Alex Dale
069de13b94 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 51f5315a62 
Change-Id: I2389b404ec92b17fac807fd15c2838678d2c3a82
 2020-05-01 01:38:01 +00:00
Alex Dale
5558f13d57 Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 44cc2500b3 
Change-Id: I858b69423e9eec2b1b96a35bc53cda1698503a3f
 2020-05-01 01:38:00 +00:00
Alex Dale
616b9a8489 Update AddEntry() for usage table changes. am: 66e3d69300 am: 4c97abd57a 
Change-Id: If59a035ccfde69a7467002dd722085a8d33dce69
 2020-05-01 01:37:51 +00:00
Alex Dale
41ed193982 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 51f5315a62 
Change-Id: I6380107c6373b1ed721e2dba3a9c51dd4af5c3e8
 2020-05-01 01:37:49 +00:00
Alex Dale
9e0e33244c Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 44cc2500b3 
Change-Id: I9c6ffa1e315173b47de86a946f42d7a6834b3000
 2020-05-01 01:37:48 +00:00
Alex Dale
0a7e070618 Update AddEntry() for usage table changes. am: 66e3d69300 
Change-Id: Id13aecce1f3d62b373517a30bdb6b557e1fc0b4c
 2020-05-01 01:22:38 +00:00
Alex Dale
4793f1f1b3 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 
Change-Id: I5f34d2c928d5e7c6bced7dd8d1f623ef1d651820
 2020-05-01 01:22:35 +00:00
Alex Dale
4c97abd57a Update AddEntry() for usage table changes. am: 66e3d69300 
Change-Id: I83808cf7ebd0ed0f616766564864943fd152f7c3
 2020-05-01 01:22:33 +00:00
Alex Dale
49458c55d1 Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 
Change-Id: I3c73c57cfc6da856130ad7ba723dd60522285941
 2020-05-01 01:22:33 +00:00
Alex Dale
51f5315a62 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 
Change-Id: I3afd210c896fd0ffa794f1565bf7baee53e4b77e
 2020-05-01 01:22:30 +00:00
Alex Dale
44cc2500b3 Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 
Change-Id: Ic6a6d107a138f9a2ad9b2a935751249587bf540e
 2020-05-01 01:22:29 +00:00
Alex Dale
66e3d69300 Update AddEntry() for usage table changes. 
[ Merge of http://go/wvgerrit/96071 ]

Changes to how the usage table method InvalidateEntry() behaves
required additional changes to CDM code that uses this method.

This involved some refactoring to AddEntry(), moving the LRU
related code to its own function.

A few unittests had to be changed / removed as the moving
multiple entries changes expectations of several existing tests.

Several additional helper methods have been created to improve
readability.  These include getters for information about the
usage table, a method for releasing stale entries, and a method of
recording LRU metrics.

Bug: 150890014
Bug: 150887808
Bug: 154269671
Test: Linux unit tests and Android unit tests
Change-Id: I11a98f9a2dea9b2ae57b37d7d4483a37be721763
 2020-04-30 18:00:25 -07:00
Alex Dale
1e5e221909 Added a few edge case unittests for InvalidateEntry(). 
[ Merge of http://go/wvgerrit/95365 ]

The changes made to how DeleteEntry (now InvalidateEntry) works
introduced a few additional edge cases which were not covered from the
previous set of unit tests.

Bug: 150887808
Bug: 149100568
Test: Linux unit tests and Android unit tests
Change-Id: I263b72fb708c6546294af23ae5ddbd2e82da34df
 2020-04-30 18:00:25 -07:00
Alex Dale
da48461ba2 Reworked DeleteEntry() into InvalidateEntry(). 
[ Merge of http://go/wvgerrit/95406 ]

There was an issue with DeleteEntry() where it would result in an
invalid table state if shrinking the usage table when the number of
sessions is at its max.

This required changing how the usage table invalidates entries.  Now,
after invalidating an entry (marking an entry as kStorageTypeUnknown)
the table is defragmented if specified to.

Defragmentation involves:
1)  Move valid entries near the end of the table to the position of
    invalid entries near the front of the table.
2)  Shrinking the table to cut off trailing invalid entries.

This change updates the existing tests to pass, but still needs new
tests for some of the edge cases.

Bug: 150887808
Bug: 149100568
Test: Linux unit tests and Android unit tests
Change-Id: I70c7b296e5e4b367746fcdaabbf0f12dcfb39230
 2020-04-30 18:00:25 -07:00
Alex Dale
59d7cb045a Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 am: d7f5a74ea3 am: f5d4746529 am: 12f443a173 
Change-Id: I705083ae9fc2ead6a8e6edd3cc4838d00d51a2bc
 2020-05-01 00:51:26 +00:00
Alex Dale
a75453029c Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 am: 3c2ae73dba am: f3d01f6f96 
Change-Id: Ife646617a97a9c84f28c1ed46ca2da23aa3b7814
 2020-05-01 00:36:46 +00:00
Alex Dale
81f27573e1 Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 am: d7f5a74ea3 am: f85508f4b3 
Change-Id: Ia303de612ed165e912a2ec49943215cdb5614f89
 2020-05-01 00:36:00 +00:00
Alex Dale
12f443a173 Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 am: d7f5a74ea3 am: f5d4746529 
Change-Id: Ieed0176425675853df00e2125904fa36a16be8ac
 2020-05-01 00:35:53 +00:00
Alex Dale
f3d01f6f96 Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 am: 3c2ae73dba 
Change-Id: I51a25bfed2aae1632eae22d249ba368bf79c5ed8
 2020-05-01 00:24:35 +00:00
Alex Dale
f85508f4b3 Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 am: d7f5a74ea3 
Change-Id: I3bca213757648556ed9ceb7b8ca0349ee170a119
 2020-05-01 00:24:23 +00:00
Alex Dale
f5d4746529 Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 am: d7f5a74ea3 
Change-Id: Idb87851939277a1950b0ad5605c48a772ae56a6d
 2020-05-01 00:24:13 +00:00
Alex Dale
d7f5a74ea3 Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 
Change-Id: Ia522d7b007a4088ff7f1812115196a06408ea186
 2020-05-01 00:09:49 +00:00
Alex Dale
3c2ae73dba Merge "Suppress error for removing lingering offline licenses." into rvc-dev am: 792e17a8c4 
Change-Id: Ie2e4862f5415f46cd5c3a78a5c8651017f8507c2
 2020-05-01 00:09:40 +00:00
Alex Dale
792e17a8c4 Merge "Suppress error for removing lingering offline licenses." into rvc-dev 2020-04-30 23:53:44 +00:00