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

7075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Shih
5a43223acc Merge "metrics: set OEMCrypto initialization errors correctly" into sc-dev am: 85afe8c0b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238887

Change-Id: Ief36a433258282ef89cffd75e5e10f0f76b1148d
 2021-04-28 21:51:28 +00:00
Robert Shih
ca6153e7d8 Merge "metrics: set OEMCrypto initialization errors correctly" into sc-dev am: 85afe8c0b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238887

Change-Id: I085c56c3af4748b0bb156d34d4bb25b795a3d57c
 2021-04-28 21:51:02 +00:00
Robert Shih
85afe8c0b0 Merge "metrics: set OEMCrypto initialization errors correctly" into sc-dev 2021-04-28 21:31:23 +00:00
Ulyana Trafimovich
2fe594f079 Merge "Disable dexpreopt and <uses-library> check for tests." into sc-dev am: 4b9ec9eab6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14326926

Change-Id: I06f606837e174d6cc3c9bb5c088bbbcc14f3054b
 2021-04-28 09:58:50 +00:00
Ulyana Trafimovich
d7fe1ff2cf Merge "Disable dexpreopt and <uses-library> check for tests." into sc-dev am: 4b9ec9eab6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14326926

Change-Id: I16ff9f6df17577231bd50252bd7b4dce585bbdb9
 2021-04-28 09:57:02 +00:00
Ulyana Trafimovich
f2e4b444f0 Merge "Disable dexpreopt and <uses-library> check for tests." into sc-dev am: 4b9ec9eab6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14326926

Change-Id: Ica41e0546be048a58d20736df2a41f9142a0b869
 2021-04-28 09:56:59 +00:00
Ulyana Trafimovich
4b9ec9eab6 Merge "Disable dexpreopt and <uses-library> check for tests." into sc-dev 2021-04-28 09:38:17 +00:00
Robert Shih
e1c94b109f Merge "Update Android WVCdm version to 16.1.0" into sc-dev am: 7a061b503f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14313686

Change-Id: Ib4c80cf6d8ab00b4d0443a2f6972999ec28e1558
 2021-04-27 21:40:45 +00:00
Robert Shih
f88f5e1d8b Merge "Update Android WVCdm version to 16.1.0" into sc-dev am: 7a061b503f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14313686

Change-Id: Ibc8e863e46662264ba775359ab4b240d9c706e35
 2021-04-27 21:40:09 +00:00
Robert Shih
c2f8ada7ef Merge "Update Android WVCdm version to 16.1.0" into sc-dev am: 7a061b503f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14313686

Change-Id: Icefb802c523236c79a36dc9a3f13d068758d8a38
 2021-04-27 21:02:44 +00:00
Robert Shih
7a061b503f Merge "Update Android WVCdm version to 16.1.0" into sc-dev 2021-04-27 20:59:28 +00:00
Rahul Frias
a8a59e5f7c Merge "Address CE CDM code review comments" into sc-dev am: 9b3e37b038 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14253246

Change-Id: I0bae63a3e43634bd93bd2a8745c27af64680b26d
 2021-04-27 20:52:16 +00:00
Rahul Frias
20318013b9 Merge "Address CE CDM code review comments" into sc-dev am: 9b3e37b038 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14253246

Change-Id: Ie970901143abaf14b4f3f1edc45c473f219a4ddb
 2021-04-27 20:50:34 +00:00
Rahul Frias
78099431a8 Merge "Address CE CDM code review comments" into sc-dev am: 9b3e37b038 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14253246

Change-Id: Icac8e27e2b15ae1298e3ed75b66c8593525f02b8
 2021-04-27 20:50:34 +00:00
Rahul Frias
9b3e37b038 Merge "Address CE CDM code review comments" into sc-dev 2021-04-27 20:27:35 +00:00
TreeHugger Robot
63db607211 Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev am: 03dff71bd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14212412

Change-Id: Ife8f17dddf30ef0e433b3e5fe5a965e76ce7ef04
 2021-04-27 19:35:05 +00:00
TreeHugger Robot
36b457b519 Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev am: 03dff71bd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14212412

Change-Id: I9855b8b11675fe46f74793808d6eeede076fd9f0
 2021-04-27 19:34:09 +00:00
TreeHugger Robot
15bf2eec0b Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev am: 03dff71bd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14212412

Change-Id: I1837921fb595a45514ce17befccc0fc82cd20193
 2021-04-27 19:33:36 +00:00
TreeHugger Robot
03dff71bd8 Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev 
* changes:
  Fix CDM Builds w/ OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION
  Fix unused param warnings in oemcrypto fuzz test
  Add http socket tests to other tests
  Turn on ODK tests in CE CDM test and fix test helper
 2021-04-27 19:20:34 +00:00
Cong Lin
22f8ee9498 [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev 
Merge of [http://go/wvgerrit/118363]. Fixes included:

http://go/wvgerrit/111603
Fix L3 block offset test and re-enable buffer overflow tests

http://go/wvgerrit/111784
Fix heap overflow test in L3 and OEMCrypto ref

http://go/wvgerrit/113644
Check for buffer overflow when computing subsample size

http://go/wvgerrit/113946
Fix test failures caused by huge key length in L3

Test: Ran L3 unit tests
Test:
https://android-build.googleplex.com/builds/forrest/run/L81800000863169076
Bug: 182584472

Change-Id: Iae051ac2c06eb263b3b3be76d56b42917340af1d
 2021-04-27 09:35:03 -07:00
Cong Lin
5ea6b86f79 [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix 
rvc-dev

Merge of [http://go/wvgerrit/123644]. Fix included:

http://go/wvgerrit/111603
Fix L3 block offset test and re-enable buffer overflow tests

http://go/wvgerrit/111784
Fix heap overflow test in L3 and OEMCrypto ref

Test: Ran L3 unit tests
Test:
gts-tradefed run gts --module GtsMediaTestCases
gts-tradefed run gts --module GtsExoPlayerTestCases
Bug: 182584472

Change-Id: I70bda559c4b5158c3461dcdfee72a8953f31a942
 2021-04-27 09:21:59 -07:00
Ereth McKnight-MacNeil
0ef5d387f4 Shell quoting in move_widevine_data.sh am: 63eae1f4a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13472583

Change-Id: I7bd550bbab9a725d70824b75d81072831c0a9ad3
 2021-04-27 16:14:54 +00:00
Ereth McKnight-MacNeil
8b445179ee Shell quoting in move_widevine_data.sh am: 63eae1f4a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13472583

Change-Id: I0b3be6c7378de37372e400966c91138b5772bd92
 2021-04-27 16:13:50 +00:00
Ereth McKnight-MacNeil
09e7e4d090 Shell quoting in move_widevine_data.sh am: 63eae1f4a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13472583

Change-Id: Ia7d264c234959adfc2a6dd961d6d51db293e0bb7
 2021-04-27 16:12:34 +00:00
Ulya Trafimovich
07440a83bf Disable dexpreopt and <uses-library> check for tests. 
Bug: 132357300
Test: treehugger
Change-Id: Ia2c6cba7a4a91f6d3b0b343a44c4257817c3a4cf
 2021-04-27 14:27:37 +01:00
Ereth McKnight-MacNeil
63eae1f4a4 Shell quoting in move_widevine_data.sh 
Add double quotes to prevent globbing and word splitting.

Bug: crbug.com/1168550
Test: Create /data/mediadrm files and observe they are moved
Change-Id: I8d1cd70971588f903657825ea6e10c019954f403
(cherry picked from commit 8649f7a952b7e4f8edd17edfca0b0962e2fb2662)
(cherry picked from commit 84d0d73be5)
 2021-04-27 00:27:27 +00:00
Robert Shih
3a503278e6 Update Android WVCdm version to 16.1.0 
TODO: update VersionNumberTest.VersionNumberChangeCanary

[ Merge of http://go/wvgerrit/123403 ]

Bug: 183073374
Test: GtsMediaTestCases
Change-Id: I1773416b6f3f212bead5e6b7749da52883041d07
 2021-04-26 12:00:16 -07:00
Rahul Frias
32286032e1 Replace DeviceFiles::LicenseState with CdmOfflineLicenseState am: 4c4e746e57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14280044

Change-Id: Ida3544a21d1654b473290b7074240357daa7603f
 2021-04-25 06:18:03 +00:00
Rahul Frias
273da751b1 Replace DeviceFiles::LicenseState with CdmOfflineLicenseState am: 4c4e746e57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14280044

Change-Id: I684dc8fea4eec67d4754707ee75e598041841192
 2021-04-25 06:16:30 +00:00
Rahul Frias
08472ad6c4 Replace DeviceFiles::LicenseState with CdmOfflineLicenseState am: 4c4e746e57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14280044

Change-Id: I696ec3827888b32a44feef70a99f298e8cb37e44
 2021-04-25 06:16:22 +00:00
Rahul Frias
4c4e746e57 Replace DeviceFiles::LicenseState with CdmOfflineLicenseState 
[ Merge of http://go/wvgerrit/123003 ]

Bug: 160006474
Test: WV unit/integration tests
Change-Id: Ied813f58405fcac44f0543f715ab2175129bbf9c
 2021-04-24 00:30:20 -07:00
Rahul Frias
9ee95389ca Merge "Correct request_license_test failures" into sc-dev am: 46a3f6c608 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14263147

Change-Id: I63e3aa20532a76754b9b1d1feb265f94d66c0b50
 2021-04-24 01:26:39 +00:00
Rahul Frias
7055fbb02a Merge "Correct request_license_test failures" into sc-dev am: 46a3f6c608 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14263147

Change-Id: Ibacff353afc23f1a683b00e5bfaebfa7541701ab
 2021-04-24 01:25:30 +00:00
Rahul Frias
12da56ee90 Merge "Correct request_license_test failures" into sc-dev am: 46a3f6c608 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14263147

Change-Id: I573e05527cc716835d3914786f94de46744e0477
 2021-04-24 01:24:05 +00:00
Rahul Frias
46a3f6c608 Merge "Correct request_license_test failures" into sc-dev 2021-04-24 01:03:49 +00:00
TreeHugger Robot
a8ced08a5e Merge "Clean up CdmEngine logs." into sc-dev am: bee62d797e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137667

Change-Id: I42d79e88785dffd56f07e899a240727e8ea6fffd
 2021-04-23 20:52:36 +00:00
TreeHugger Robot
2f7fc0e492 Merge "Clean up CdmEngine logs." into sc-dev am: bee62d797e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137667

Change-Id: I1b060d8c2263b65c46613b50cbc7546d00146e5d
 2021-04-23 20:51:01 +00:00
TreeHugger Robot
b46ceca064 Merge "Clean up CdmEngine logs." into sc-dev am: bee62d797e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137667

Change-Id: Ib4c932dfacb63d62590e43db80b818bd63fcec31
 2021-04-23 20:50:41 +00:00
TreeHugger Robot
bee62d797e Merge "Clean up CdmEngine logs." into sc-dev 2021-04-23 20:35:53 +00:00
Rahul Frias
c21d40c68f Address CE CDM code review comments 
Undoes a change to the buffer size from http://ag/13865723

Bug: 184813991
Test: WV unit/integration tests
Change-Id: I40cf786f149626ff65a3362020b3da859bb86159
 2021-04-23 12:26:34 -07:00
Fred Gylys-Colwell
ebb7d45a25 Fix CDM Builds w/ OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION 
Merge from Widevine repo of http://go/wvgerrit/108224

A recent Copybara merge to master broke CDM builds by introducing a
new OEMCrypto error code. This patch adds it to the test printers so
that the build can pass again.

Bug: 185597829
Test: CE CDM Build
Change-Id: I6dd829f4c618c9ebec937cf711ff57b7f1678994
 2021-04-23 10:11:48 -07:00
Fred Gylys-Colwell
a87eec804c Fix unused param warnings in oemcrypto fuzz test 
Merge from Widevine repo of http://go/wvgerrit/122403

Re-merge of http://go/wvgerrit/105184 which was accidentally
undone by http://go/wvgerrit/107063.

Unused params are reported as warning when built in Android.

Test: Ran oemcrypto unit tests
Bug: 160734070
Change-Id: Id8384c58c8ace0b214464380fb961d108f1b5c3b
 2021-04-23 10:11:48 -07:00
Fred Gylys-Colwell
5a58b6d8d2 Add http socket tests to other tests 
Merge from Widevine repo of http://go/wvgerrit/122224

This CL removes the separate main() in http_socket_test that
allowed the user to set the server on the command line.  I
don't think anybody was using this, and it conflicted with
our desire to include this suite of tests with the other CE
CDM tests running on Luci.

test: ran http_socket_test
bug: 118657876
Change-Id: I9228b9cc97a0af2afd1bb4a99bc40b88ce956d67
 2021-04-23 10:11:48 -07:00
Fred Gylys-Colwell
14a034209c Turn on ODK tests in CE CDM test and fix test helper 
Merge from Widevine repo of http://go/wvgerrit/122223

This adds the ODK unit tests to the CE CDM tests so that they run as
part of the presubmit tests.

The test helper had some pointer problems converting a bool to a
uint32, so it has been updated to handle this correctly.

Some other tests failed comparing signed to unsigned, to these have
also been fixed.

test: ran odk_test
bug: 118657876
Change-Id: I744a1e89f4e4729c31d3f53e729984ffac1d96fd
 2021-04-23 10:11:48 -07:00
Rahul Frias
87e84d5498 Use Usage information from OEMCrypto on clock rollback 
[ Merge of http://go/wvgerrit/123103 ]

This corrects setting of first and last playback times stored by the
CDM on rollback. Earlier usage information from the usage entry in
OEMCrypto would be ignored on rollback even when available.
Information stored along with the license in persistent storage would
be used instead.

A new test with longer duration expiry has been added as well as some
additional verification.

Bug: 186199213
Test: WV unit/integration test
Change-Id: I601f9584a8a0c5137ce68546f8ec833bf2e70cc5
 2021-04-23 03:58:31 -07:00
Rahul Frias
2a316f65fe Correct request_license_test failures 
[ Merge of http://go/wvgerrit/122885 ]

A recent change to the license service resulted in PSTs being inserted
into persistent renewable licenses even when not specified by the
content provider. This caused ReleaseOfflineKeySessionUsageDisabledTest
to fail. The asset was changed to use a policy for a persistent
license without renewal.

Offline_RollbackBeforeRestoreKey failed because the duration of the
license is short. It has expired when the clock is restored after a
rollback.

Bug: 181693982
Test: request_license_test
Change-Id: I0a2c2a09e563c81c134fba1f310deb1eb4de26a3
 2021-04-23 01:52:18 -07:00
Bob Badour
dc7573bb82 Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: 99b73280e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14284399

Change-Id: Iff5ab07b28fb47c09e5e21898d76e43c5db56532
 2021-04-23 04:40:37 +00:00
Bob Badour
f6f0391de9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: 99b73280e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14284399

Change-Id: I78dd480fbbfe3bb31974bd8302ba5f60b6c5977c
 2021-04-23 04:38:54 +00:00
Bob Badour
847559d5d5 Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: 99b73280e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14284399

Change-Id: Ia6cca7b3500b1e6a7a78f63ca0388c90be0cfcee
 2021-04-23 04:38:18 +00:00
Bob Badour
99b73280e6 Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev 2021-04-23 04:07:59 +00:00