Automerger Merge Worker
3599bf02a4
Merge "Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: 4188d4478b" into rvc-d1-dev-plus-aosp am: 72eebd9d75 am: b5996adea3
...
Change-Id: Ib23b929e090bd296c6798eb9de740cef4a522cf0
2020-03-26 04:26:10 +00:00
Alex Dale
1ee536a480
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 am: 8aff059243 am: 7402eb8f0f
...
Change-Id: I9002c7764c1b6c5ad57491ba20e7ada41e89b289
2020-03-26 04:25:55 +00:00
Alex Dale
547ef61575
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 am: a983f577b1 am: 228075d3f5
...
Change-Id: I6ce1d33eba4b2d754ead1da916d7c245be459add
2020-03-26 04:25:47 +00:00
Alex Dale
d878496af2
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac am: 4e22b2253c am: efc12c3cef
...
Change-Id: I39cb171d6e36ce6fc4eb650f8c9e8f384171b927
2020-03-26 04:25:37 +00:00
Alex Dale
9ae6ffd1db
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac am: c75f01f7c9 am: 819f20e6aa
...
Change-Id: Ic55ed4932c977caa23a6f6ac90453ddf0c0d013b
2020-03-26 04:25:26 +00:00
Alex Dale
21561e45dc
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: d650718c27 am: 970ceb343a
...
Change-Id: I13bf21d6405c9f8205bd82dbaf2f8a274040543c
2020-03-26 04:14:19 +00:00
Automerger Merge Worker
b5996adea3
Merge "Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: 4188d4478b" into rvc-d1-dev-plus-aosp am: 72eebd9d75
...
Change-Id: I1e488e37b7bf9829e7e9a0219ba80dc069cbb661
2020-03-26 04:14:14 +00:00
Alex Dale
7402eb8f0f
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 am: 8aff059243
...
Change-Id: I97780666cdeb31aa93b4c219a1d65023acc3bb87
2020-03-26 04:14:07 +00:00
Alex Dale
228075d3f5
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 am: a983f577b1
...
Change-Id: Idb46a4220146d271be1c25974445a17cfcb8c37c
2020-03-26 04:13:36 +00:00
Alex Dale
efc12c3cef
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac am: 4e22b2253c
...
Change-Id: Id31e8bd535de82aad9434382c912298bff9222e7
2020-03-26 04:13:35 +00:00
Alex Dale
819f20e6aa
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac am: c75f01f7c9
...
Change-Id: I32bcb618b47891f83fb49dd87ddb2938341c5a3c
2020-03-26 04:13:30 +00:00
Alex Dale
a983f577b1
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2
...
Change-Id: Ifa3470a582eb45437e98e25c49043cc08b6ffce7
2020-03-26 03:57:31 +00:00
Alex Dale
970ceb343a
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: d650718c27
...
Change-Id: I5b122e382a37fa977ae6f5e661fc64beff34eaa5
2020-03-26 03:57:26 +00:00
Alex Dale
c75f01f7c9
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac
...
Change-Id: Ic3bbf3ed9662db105921e68a2edaf54e035d1fc5
2020-03-26 03:57:26 +00:00
Automerger Merge Worker
72eebd9d75
Merge "Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: 4188d4478b" into rvc-d1-dev-plus-aosp
2020-03-26 03:57:15 +00:00
Alex Dale
84e758c3e4
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: 4188d4478b
...
Change-Id: I329bd2e415818e7b8d410de424a0df769f3eb2e1
2020-03-26 03:57:11 +00:00
Alex Dale
8aff059243
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2
...
Change-Id: Ib3008c8544f885190ab5645fd64181abd9aee971
2020-03-26 03:57:10 +00:00
Alex Dale
4e22b2253c
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac
...
Change-Id: I8652c63f22c9f71bc548c0af07cc4071ac48904b
2020-03-26 03:56:56 +00:00
Alex Dale
d650718c27
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c
...
Change-Id: I2853ab3f534c8f1c3d7a5597bfc69a4685574d19
2020-03-26 03:45:43 +00:00
Alex Dale
ef31c865f2
Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c
...
Change-Id: Ifa6a1bc17ceb2dded06cb4f6547c6bc7d4478983
2020-03-26 03:45:34 +00:00
Alex Dale
4188d4478b
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e
...
Change-Id: Iab515ba54795d43abd7eefd02d41461aabd777bb
2020-03-26 03:45:24 +00:00
Alex Dale
b587f64cac
Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e
...
Change-Id: I84ec88383d316d56cfba3fce6f8cd3ab7e315bec
2020-03-26 03:45:09 +00:00
Alex Dale
73f301a66c
Merge "Usage table header operations no longer need an open session." into rvc-dev
2020-03-26 03:27:31 +00:00
Alex Dale
8d45d93d0e
Merge "New CDM error codes for usage table errors." into rvc-dev
2020-03-26 03:26:30 +00:00
TreeHugger Robot
afbada2eb0
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 8dec93cb18 am: 8c51fafe8c am: 60097abd8d
...
Change-Id: I469cd012e1513165a6a65c936b0356c649f64c5a
2020-03-25 20:28:03 +00:00
TreeHugger Robot
a8aecd468d
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 9a3e97dcf5 am: e0416f73a2
...
Change-Id: Id5d3b8db534b95e959b66c92382d5db90be26e8e
2020-03-25 20:27:46 +00:00
TreeHugger Robot
be6c0fed77
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: b82da207fd am: 6f1601d18e am: 9f3480875d
...
Change-Id: Ife7d72e6b70bd32a53da06e82f2f579065514fd5
2020-03-25 20:27:21 +00:00
TreeHugger Robot
60097abd8d
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 8dec93cb18 am: 8c51fafe8c
...
Change-Id: Iba577a4056709e20d1a74f9197e99095925e11f0
2020-03-25 20:27:15 +00:00
TreeHugger Robot
8c51fafe8c
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 8dec93cb18
...
Change-Id: I0893bb11d9fac82fa821d7e0c078cd558ad681b7
2020-03-25 20:02:36 +00:00
TreeHugger Robot
e0416f73a2
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 9a3e97dcf5
...
Change-Id: I91636f2e1b09de7a11a9489c663a24947c216191
2020-03-25 20:02:34 +00:00
TreeHugger Robot
9f3480875d
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: b82da207fd am: 6f1601d18e
...
Change-Id: I0499933adbcc61fbdd6d352611faef1b3b9ec3ca
2020-03-25 20:02:06 +00:00
TreeHugger Robot
8dec93cb18
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50
...
Change-Id: I23ca755ece35fc92398f8ddc8dd5a94f1fb085c0
2020-03-25 19:49:23 +00:00
TreeHugger Robot
9a3e97dcf5
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50
...
Change-Id: I0237b16779c5d5519a83e44b15d16dd3fe2f0ee3
2020-03-25 19:49:19 +00:00
TreeHugger Robot
6f1601d18e
Merge "Address review comments" into rvc-dev am: d035d76ed6 am: b82da207fd
...
Change-Id: I6a6132c41c713a896bb0ff9090b6b6425899b17f
2020-03-25 19:49:06 +00:00
TreeHugger Robot
b82da207fd
Merge "Address review comments" into rvc-dev am: d035d76ed6
...
Change-Id: I66931f849edf67e9d1bde00a5d948969615a16b9
2020-03-25 19:31:01 +00:00
TreeHugger Robot
7f56b4cc50
Merge "Address review comments" into rvc-dev am: d035d76ed6
...
Change-Id: Ib6c7e07e64126ab954eee0b4bbde8c632f3558f3
2020-03-25 19:30:23 +00:00
TreeHugger Robot
d035d76ed6
Merge "Address review comments" into rvc-dev
2020-03-25 19:14:55 +00:00
Fred Gylys-Colwell
80b0005d44
Address review comments
...
Merge from Widevine repo of http://go/wvgerrit/96163
This CL just addresses some review comments from the big merge to
master. The header OEMCryptoCENC.h is now synced with the
document http://go/oemcrypto .
Test: unit tests
Bug: 148907684
Change-Id: Ic825126e0dd3d7e86eefab2c51b4abb5d57fb568
2020-03-25 16:16:58 +00:00
Alex Dale
193d5c384d
Usage table header operations no longer need an open session.
...
[ Merge of http://go/wvgerrit/95405 ]
There are several OEMCrypto functions that do not require an open
session to be called. This change updates the OEMCrypto functions
related to the Usage Table Header.
Bug: 150888316
Test: Linux unit tests and Android build
Change-Id: Ic879876dd190fb3e058bbe8e0cce37273030b105
2020-03-23 12:56:41 -07:00
Alex Dale
c9e4dd2495
New CDM error codes for usage table errors.
...
[ Merge of http://go/wvgerrit/95404 ]
There are three situtations where error codes from a usage table
operations were not being mapped to unique CDM response types. These
particular errors provide useful information for the CDM during table
defragging.
Also fixed misspelled error code.
Bug: 150890014
Bug: 150891685
Test: Linux unit tests and Android build
Change-Id: I683abdd5fc0871317eede960ea36cfafac7e7f49
2020-03-23 12:54:27 -07:00
Rahul Frias
542f500b03
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04 am: 798be44069 am: 2390975848 am: e6b910061c
...
Change-Id: Idba2e738f3a997f2659d1f562b4b2f0731fa0074
2020-03-20 03:23:27 +00:00
Rahul Frias
726dffbe30
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: 32643b1899 am: f45938b44c am: cb1ed7300e
...
Change-Id: Ib1cfff5e3a3d4023c9aa2fd3ad8624a04d398912
2020-03-20 03:21:46 +00:00
Rahul Frias
e6b910061c
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04 am: 798be44069 am: 2390975848
...
Change-Id: Ic8aac65cc5ed3f450742bda631ca227ca046f1e3
2020-03-20 03:20:09 +00:00
Rahul Frias
d09d8f429e
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04 am: eb58868d5d am: c64539edd7
...
Change-Id: I2414ae8d621e1a7c2b20a962b9a6272e34cbb532
2020-03-20 03:19:18 +00:00
Rahul Frias
cb1ed7300e
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: 32643b1899 am: f45938b44c
...
Change-Id: I7bea96fc43de559e53daa50915eacc29bafec9c0
2020-03-20 03:02:51 +00:00
Rahul Frias
2390975848
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04 am: 798be44069
...
Change-Id: I605d6546f7e6b77521cd30b95b1f293b7fe0ca40
2020-03-20 03:02:46 +00:00
Rahul Frias
c64539edd7
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04 am: eb58868d5d
...
Change-Id: I7d918b3a9e523e71ea853b13f2ae476d4fb76ff7
2020-03-20 03:02:29 +00:00
Rahul Frias
f45938b44c
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: 32643b1899
...
Change-Id: I505df1cde7084a499257d1bf6cda7fb07d7fa353
2020-03-20 02:39:13 +00:00
Rahul Frias
798be44069
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04
...
Change-Id: I283489c958173cd2a7aac7b55e12429974a6781e
2020-03-20 02:39:05 +00:00
Rahul Frias
eb58868d5d
Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04
...
Change-Id: I859eff5e479858b4a0bcf01155aade1d23c9bb30
2020-03-20 02:39:05 +00:00
