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

3980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rahul Frias
32643b1899 Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 
Change-Id: I320879e8fce824035385e8d6ff5c47457174590b
 2020-03-20 02:23:17 +00:00
Rahul Frias
d107dd8f04 Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 
Change-Id: I6b0ff1b8de6f7f15880216278fb3f83e0740d650
 2020-03-20 02:22:55 +00:00
Rahul Frias
8c1f8f1469 Merge "Move the CDM version string to a header file" into rvc-dev 2020-03-20 01:59:36 +00:00
Fred Gylys-Colwell
3f385a7ec3 Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c am: 9030a671c8 am: ecee9d9dab am: 36eb85df72 
Change-Id: I845061c74840ca3ddb7c05d1f2f165b3db801f94
 2020-03-19 20:18:44 +00:00
Fred Gylys-Colwell
680ba24a4c Log oemcrypto unit test version number am: 88934aa322 am: 7fae7e41b8 am: d869cbb559 am: 3b7bcd2dd6 
Change-Id: Ia8289040ad38920b9220af174ed353625d155342
 2020-03-19 20:17:45 +00:00
Fred Gylys-Colwell
ac7b9644a8 Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c am: ca3b0b14af am: c768662f84 
Change-Id: I64672f38819ebac9a24994f6db0054e53da1bbfa
 2020-03-19 20:16:36 +00:00
Fred Gylys-Colwell
36eb85df72 Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c am: 9030a671c8 am: ecee9d9dab 
Change-Id: I6988fb3d35430c8540055f364ad1a73e8bda30d3
 2020-03-19 20:16:01 +00:00
Fred Gylys-Colwell
ecee9d9dab Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c am: 9030a671c8 
Change-Id: Ifa2fa588be8f2ac0bd1514faf70a9faaac2ee1f6
 2020-03-19 19:47:52 +00:00
Fred Gylys-Colwell
3b7bcd2dd6 Log oemcrypto unit test version number am: 88934aa322 am: 7fae7e41b8 am: d869cbb559 
Change-Id: Iaecf9bbd5cd753e04644ca203982d84fdd1dfb24
 2020-03-19 19:42:01 +00:00
Fred Gylys-Colwell
c768662f84 Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c am: ca3b0b14af 
Change-Id: I63a41b219bc2ee64b1e4f6255b7e3d5ba33fd794
 2020-03-19 19:40:55 +00:00
Fred Gylys-Colwell
9030a671c8 Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c 
Change-Id: I935d51f4e1077e1e53cd61e8c6d8cdd9bc170cd3
 2020-03-19 19:24:57 +00:00
Fred Gylys-Colwell
d869cbb559 Log oemcrypto unit test version number am: 88934aa322 am: 7fae7e41b8 
Change-Id: I8e998189c72b2853ed36ebb410a6e8e4a00b1616
 2020-03-19 19:24:45 +00:00
Fred Gylys-Colwell
ca3b0b14af Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c 
Change-Id: I682ef8603ee8bffaffba2c94a61600d897209134
 2020-03-19 19:24:34 +00:00
Fred Gylys-Colwell
7fae7e41b8 Log oemcrypto unit test version number am: 88934aa322 
Change-Id: I48114dba4e2e95f3457d0f984e2a32212b0a0b96
 2020-03-19 19:09:13 +00:00
Fred Gylys-Colwell
dd7947af7c Log oemcrypto unit test version number am: 88934aa322 
Change-Id: I438cf0cc2b888724f6bb0853ae6884dfd8f0ba29
 2020-03-19 19:09:07 +00:00
Fred Gylys-Colwell
88934aa322 Log oemcrypto unit test version number 
Merge from Widevine repo of http://go/wvgerrit/95483

This adds a log message to the oemcrypto unit tests so that if
somebody sends us a log, we can tell which version they are
running.

With this CL, the version string is
OEMCrypto unit tests for API 16.2. Tests last updated 2020-03-18

This can be found in the logs and in stdout when running the unit test
OEMCryptoClientTest.VersionNumber. One can verify the executable on
android using
strings $OUT/data/nativetest/oemcrypto_test | grep -i "oemcrypto unit tests"

Test: ran oemcrypto_test and verified version string
Bug: 144713981
Change-Id: Ie10b2f270b783ed10a3ff9855b7ca32a5327ea1c
 2020-03-18 15:13:57 -07:00
Robert Shih
86a5f9810c Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe am: 8bc3a16378 am: 323041be1e am: efa9037416 
Change-Id: Ie175e7bda3d3671fba2a6a5719fdcd8387100675
 2020-03-18 20:34:49 +00:00
Robert Shih
db6f606573 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: ba0f9cd656 am: 8b0b474237 am: b9678b2a2a 
Change-Id: Ie28a02ce14aea336dd09f39b99ad96e31538bbe0
 2020-03-18 20:34:41 +00:00
Robert Shih
296f473833 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe am: 93436fd80b am: e7b603ffa8 
Change-Id: I2678d1e8bf162a5bb85cb08b6b70c7d6de403585
 2020-03-18 20:34:09 +00:00
Robert Shih
efa9037416 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe am: 8bc3a16378 am: 323041be1e 
Change-Id: Ic43079dd1241a604ea9f9be700118c9f2f5fed84
 2020-03-18 20:26:17 +00:00
Robert Shih
b9678b2a2a Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: ba0f9cd656 am: 8b0b474237 
Change-Id: I2cddb4aff1d27d7dee1ee01171bd8b2ba00821d1
 2020-03-18 20:15:53 +00:00
Robert Shih
e7b603ffa8 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe am: 93436fd80b 
Change-Id: I11d03ff6cbaaee05d7a3ebce1ea3312728500043
 2020-03-18 20:15:17 +00:00
Robert Shih
323041be1e Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe am: 8bc3a16378 
Change-Id: I2f40798402e703fe4e93ae586bb50a734b4669d2
 2020-03-18 20:13:22 +00:00
Robert Shih
8bc3a16378 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe 
Change-Id: I3bd4e4186aea75635af1b40a8a5ad2d9584f5caf
 2020-03-18 19:55:09 +00:00
Robert Shih
8b0b474237 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: ba0f9cd656 
Change-Id: I6452ad4cd93055b230293cc74b43e337969075fd
 2020-03-18 19:55:08 +00:00