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

3687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
7f9327bba3 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 45b6d363c1 am: 1186a8b804 am: 6690690024 
Change-Id: I9fd1560dc5446881835a8e7ac378b5b2bce81885
 2020-03-18 03:38:55 +00:00
Cong Lin
25d156a842 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 45b6d363c1 am: 1a48869f53 
Change-Id: I4564fa03068d69f4f43da23b3a01dc2e0a86a3f2
 2020-03-18 03:23:16 +00:00
Cong Lin
6690690024 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 45b6d363c1 am: 1186a8b804 
Change-Id: I5f8ac8afa67062f74d17d4512fc25c02e13b5776
 2020-03-18 03:21:52 +00:00
Cong Lin
1ef1dd763b (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 4f90f4f023 am: f0d789eb9a 
Change-Id: I3e6d777aa015388f7ebe0dab6fb4bb383997d65c
 2020-03-18 03:21:37 +00: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
1186a8b804 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 45b6d363c1 
Change-Id: I966e6fb87777f0d202ca754fafdb074bbecc9339
 2020-03-18 03:04:28 +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