widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,140 Commits 2 Branches 0 Tags
6f9bffac0e37106e592ae1810c3c7e9deebb2188
Commit Graph

5140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cong Lin
7a9ac3bd37 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e am: 3ddbada6d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I30871b153ecb19f4adf7e91f0fafb878398fb2cd
 2021-05-06 22:13:28 +00:00
Cong Lin
6514bde77e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Ibe45158298b415d67de3132f598095d983d8af81
 2021-05-06 22:13:27 +00:00
Cong Lin
3ddbada6d8 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Ib150b4d361ef7ba052d511d8440960b9ecc7deaf
 2021-05-06 21:57:55 +00:00
Cong Lin
5d1b215cb7 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I4ab4f7c5a15822960cd6f6c9d35e3292a726db40
 2021-05-06 21:57:38 +00:00
Cong Lin
8b84dd36a1 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I6d284a16c6e5d40d0d39489d9853d032dec8e043
 2021-05-06 21:56:09 +00:00
Cong Lin
1fb5b4d68c [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours 
am skip reason: skipped by user conglin

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Iab364aea4690819a484a8527e73dcc4e0da358d6
 2021-05-06 21:56:03 +00:00
Cong Lin
38d0c011ff [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I33654d8bfcf1db921c2d72c803167c6b3f403aa4
 2021-05-06 21:54:11 +00:00
Cong Lin
cff7fd681e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I306847744a3a54ed68f63ae07b005302d66196ab
 2021-05-06 21:38:05 +00:00
Cong Lin
9fbcb7f1ba [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I0ff731accf0aba941a7b0bffd237f21ec2e34891
 2021-05-06 21:37:22 +00:00
Cong Lin
bc7c7a971d [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Ia2d991d9513e17b98944256297e4caaabc96dd21
 2021-05-06 21:21:40 +00:00
Cong Lin
b6b2367e9d [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I53e5d60e293cbb0bb0072bd111aea2eb0547de57
 2021-05-06 21:20:09 +00:00
TreeHugger Robot
593f3fb581 Merge "Report Rental duration remaining" into sc-dev am: 4057559ae5 am: d6ed573989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14383050

Change-Id: I6311927011f6e258d88995560607fb91d52bb9de
 2021-05-01 01:47:26 +00:00
TreeHugger Robot
d6ed573989 Merge "Report Rental duration remaining" into sc-dev am: 4057559ae5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14383050

Change-Id: I0eed259a09196842315c1b801a3c980e9a0600f5
 2021-05-01 01:10:49 +00:00
TreeHugger Robot
ff809ac421 Merge "Report Rental duration remaining" into sc-dev am: 4057559ae5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14383050

Change-Id: I803d8b1b73d49a5f756913f4c7ca832e5f9f6d99
 2021-05-01 01:08:53 +00:00
TreeHugger Robot
4057559ae5 Merge "Report Rental duration remaining" into sc-dev 2021-05-01 00:50:13 +00:00
TreeHugger Robot
fae6d81df4 Merge "Use Usage information from OEMCrypto on clock rollback" into sc-dev am: b7662fcbf2 am: 8f84fd0491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14294932

Change-Id: I4d851db75dc71d9988eebc968e0dbf4aa05503a2
 2021-04-30 19:47:07 +00:00
TreeHugger Robot
712458babf Merge "Use Usage information from OEMCrypto on clock rollback" into sc-dev am: b7662fcbf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14294932

Change-Id: I9d1980fb3efea5ad8107014ff4fbc0618237da2f
 2021-04-30 19:35:58 +00:00
TreeHugger Robot
8f84fd0491 Merge "Use Usage information from OEMCrypto on clock rollback" into sc-dev am: b7662fcbf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14294932

Change-Id: I1b4ed41a9d28a488bd8e21c62ab8877e36e1251d
 2021-04-30 19:33:17 +00:00
TreeHugger Robot
b7662fcbf2 Merge "Use Usage information from OEMCrypto on clock rollback" into sc-dev 2021-04-30 19:18:35 +00:00
Rahul Frias
2404500ceb Report Rental duration remaining 
[ Merge of http://go/wvgerrit/124063 ]

LicenseDurationRemaining used to indicate the minimum of rental or
license duration till OEMCrypto v16. OEMCrypto v16 onwards it began
reporting rental duration alone.

This is confusing for app developers and content partners. Keeping
LicenseDurationRemaining as apps may depend on it but adding
RentalDurationRemaining for clarity.

Bug: 186838303
Test: WV unit/integration tests, WvCdmRequestLicenseTest.QueryKeyStatus
Change-Id: I6c507150a0945ee36716b4da189f5741b092c0ec
 2021-04-30 04:52:39 -07:00
Rahul Frias
0921b04e41 Disallow the ability to load offline licenses more than once 
[ Merge of http://go/wvgerrit/123263 ]

In b/65839890 we discovered that an android app loaded an offline
license more than once in a session. We did not intend to allow
this behavior but did not prohibit it. OEMCrypto v16 disallowed
this behavior at the OEMCrypto level but we worked around it
within the CDM to maintain the bad behavior. Now that we have confirmed
that the app no longer relies on that behavior, we are reverting
the CDM workaround.

Bug: 161865160
Test: WV unit/integration test, GtsMediaTestCases
      Amazon, Netflix, Google TV streaming and offline playback.
Change-Id: I31254e4c13b81587f88c6c684d08d5aa5c18e39d
 2021-04-29 16:20:30 -07:00
Cong Lin
eb9a027f0a [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev 
Merge of [http://go/wvgerrit/123643]. 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 tests https://android-build.googleplex.com/builds/forrest/run/L68100000872640856
Bug: 182584472

Change-Id: I237f52c715e691a52256bf01fa2422aeb34e45f3
 2021-04-29 09:20:52 -07:00
Alex Dale
56211c2c46 Clean up other core CDM logs. am: 0579fe805e am: ef3e079834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: Icaa9d5c994fb1f3cb7aebcc8c056c2734256042d
 2021-04-29 09:54:00 +00:00
Alex Dale
ef3e079834 Clean up other core CDM logs. am: 0579fe805e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: Ib79cdfb0eb77c8cd23fd6170cf4ff80a2b03f997
 2021-04-29 09:40:40 +00:00
Alex Dale
1f6d689763 Clean up other core CDM logs. am: 0579fe805e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: I04b3818eb2f9dbe90236ee73ddf65936035d7859
 2021-04-29 09:38:59 +00:00
Alex Dale
0579fe805e Clean up other core CDM logs. 
[ Merge of http://go/wvgerrit/122613 ]

Further log clean up in the core CDM code.
- Changed several INFO logs to DEBUG and VERBOSE
- Added more identifiers to the DEBUG logs to help match resource
  associations
- Added more enum-to-string functions
- Unknown enum values will be formatted to contain their numeric
  value

Key areas improved are the UsageTableHeader and CdmSession.

Bug: 183576879
Test: CE CDM unittests
Change-Id: I2d11e714d419e0736d3e2f7a7668e8d36d7ef449
 2021-04-28 20:39:21 -07:00
Robert Shih
d133f5fc43 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: Ie51e4dd31b263831202a650351120c814d0d46a4
 2021-04-28 21:52:33 +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
4b9ec9eab6 Merge "Disable dexpreopt and <uses-library> check for tests." into sc-dev 2021-04-28 09:38:17 +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
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
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
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
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