Commit Graph

3701 Commits

Author SHA1 Message Date
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
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
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
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
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
Robert Shih
93436fd80b Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe
Change-Id: Ie25db69a16b9e369411c13193315ecf0230286a4
2020-03-18 19:54:56 +00:00
Robert Shih
344ff21fbe Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376
Change-Id: I2411a28a382d508cd1d89d55f4f55f5adb09c6ac
2020-03-18 19:42:34 +00:00
Robert Shih
ba0f9cd656 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376
Change-Id: Ibf58f45d750f9efb4eb008d738ad22e906050dd9
2020-03-18 19:41:29 +00:00
Robert Shih
e77874f376 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev 2020-03-18 19:27:39 +00:00
Robert Shih
18fec07897 hidl WVDrmPlugin: check for listener transport errors
Transport errors usually happen when hidl client crashes in DRM event
handler.

Merged from http://go/wvgerrit/95963

Bug: 150204874
Test: artificial crashes in client DRM event listener
Change-Id: I8037374550357d003e302f2a25fbb2305ae5a5e7
2020-03-18 00:56:55 -07:00
Cong Lin
1a48869f53 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 45b6d363c1
Change-Id: Ibc387425ccffb4f33ae69c2ff66b4f553634573c
2020-03-18 03:05:39 +00:00
Cong Lin
f0d789eb9a (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 4f90f4f023
Change-Id: Ic3e9f9f01f35e434ebc0aef00220a7e23425b6a6
2020-03-18 03:04:40 +00:00
Cong Lin
4f90f4f023 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a
Change-Id: I277324d66ec0f684b4db5545831f89b441e22be3
2020-03-18 02:51:17 +00:00
Cong Lin
45b6d363c1 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a
Change-Id: Ia1d6743f0fdd1f7856fe5b645b0ce2f2465d0661
2020-03-18 02:50:03 +00:00
Cong Lin
78fddc230a (WV to Android) Fix un-initialized-value warning as error in odk_test
Merge from Widevine repo of http://go/wvgerrit/95968

Un-initialized int array allocated on heap is detected by MemorySanitizer using this command:

rabbit test --config=msan --keep_going --compilation_mode=opt --runs_per_test=1 //video/widevine/export/common/oemcrypto_core_message/odk:odk_test

Bug: 151339875
Test: cdm and odk unit tests
Change-Id: Ic3329b918636a58eccb518ded7b262c4d98c3644
2020-03-17 21:44:17 +00:00
Rahul Frias
ca39586f8d Move the CDM version string to a header file
[ Merge of http://go/wvgerrit/95943 ]

The CDM version for android is now defined in a platform specific
header file. A check for version number match has been removed
from integration tests as it will always be true. We will still
get a notification to change the CDM version when the Android OS
version gets updated.

Bug: 151663718
Test: WV unit/integration tests
Change-Id: I96bac87186e30a709585514be7f338ad2209cdf6
2020-03-16 14:55:37 -07:00
Automerger Merge Worker
92f6e8593d Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb am: c8ca1caf7d
Change-Id: I1d6b34367da7b291bcd5244f069fe4f17c654ff1
2020-03-16 06:57:29 +00:00
Automerger Merge Worker
013ee6259f Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb am: c9d2afd386
Change-Id: I1056cc89ff0849a1bd5e0781ee584ad1ca765279
2020-03-16 06:57:02 +00:00
Automerger Merge Worker
c8ca1caf7d Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb
Change-Id: I6a9d254b9b8984d4b550aac0dc3c23347fe60f87
2020-03-16 06:38:33 +00:00
Automerger Merge Worker
c9d2afd386 Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb
Change-Id: I8ae224f1394825bbcddd307669c6fe699bcf980a
2020-03-16 06:38:31 +00:00
TreeHugger Robot
7cd0aacedb Merge "Use production provisioning server for unit tests" into rvc-dev 2020-03-16 06:19:31 +00:00
Automerger Merge Worker
702b04b7f4 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 58a6b37d02
Change-Id: I2998bea5a3abfa5184c5b4aeef74a1bb40158983
2020-03-14 01:34:37 +00:00
Automerger Merge Worker
23a2560f9e Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76
Change-Id: I43075679256f54c496cd30cddf22acdd96798e14
2020-03-14 01:34:13 +00:00
Automerger Merge Worker
6688149e76 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38
Change-Id: I6db35ab5adec9bed3f16424871153ec8265f430d
2020-03-14 01:13:45 +00:00
Automerger Merge Worker
58a6b37d02 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38
Change-Id: I34eb3b444b7978696e6650aae4e6270dd4bf9d7c
2020-03-14 01:13:36 +00:00
Cong Lin
7461d0bc38 Merge "Remove the access to net.hostname" into rvc-dev 2020-03-14 00:55:08 +00:00
Automerger Merge Worker
0e2846d1e9 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: 1324af2899
Change-Id: I7ad4eb9027b33916f50ab25f4f02ca3ffa8fc126
2020-03-14 00:36:27 +00:00
Automerger Merge Worker
4c86f2b479 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88
Change-Id: I884d7923dbc4a6cc469c1b231957d98f0770a854
2020-03-14 00:36:11 +00:00
Automerger Merge Worker
1324af2899 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b
Change-Id: I1cdb120c57b236ee7c9c18422b5d5803cada4606
2020-03-14 00:18:45 +00:00
Automerger Merge Worker
f0f5475c88 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b
Change-Id: I56fc4535268bd2da1210ac23848c652ac099e97b
2020-03-14 00:18:37 +00:00
Edwin Wong
53f52cef0b Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev 2020-03-14 00:01:36 +00:00
Automerger Merge Worker
9b6135f2d8 Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 3f479621da
Change-Id: Ib958081c52a276dd524b1014f60093a77f6f66e5
2020-03-13 23:56:27 +00:00
Automerger Merge Worker
4d84d367da Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5
Change-Id: Ied36eb673947d3ab35a2abb4eccb4812ef948efe
2020-03-13 23:56:18 +00:00
Automerger Merge Worker
3f479621da Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1
Change-Id: If416900f9bf30a9c71adb14dd71711805b19dc0e
2020-03-13 23:42:25 +00:00
Automerger Merge Worker
20274578e5 Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1
Change-Id: I01c572c301744baff41eb3b9b581b1853a8e4736
2020-03-13 23:42:17 +00:00
Fred Gylys-Colwell
80d93c31f9 Use production provisioning server for unit tests
Merge from Widevine repo of http://go/wvgerrit/95848

The production provisioning server supports v16 now. Time to go back
home.

Bug: 149720416
Test: unit tests w/v16 mod mock
Change-Id: Ie67165d7e30dd22c54a08626d50346c4aa57cb72
2020-03-13 16:37:23 -07:00
Rahul Frias
587f488ac1 Merge "Disable delayed termination on unprovisioning" into rvc-dev 2020-03-13 23:26:45 +00:00
Automerger Merge Worker
c89e450f8b ODK: Address review comments am: 5a6a2075f5 am: da9e54342a
Change-Id: I5c4c6dab960b4f7848890e6dbeaf047cc38b11cf
2020-03-13 21:43:05 +00:00