Commit Graph

5212 Commits

Author SHA1 Message Date
Rahul Frias
361dbbe269 Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365

Change-Id: If44b6b6e4bca49936efa3e76fd885774da0763e8
2021-05-07 22:34:22 +00:00
Rahul Frias
bb0b6b4ba5 Merge "Disallow the ability to load offline licenses more than once" into sc-dev 2021-05-07 22:21:03 +00:00
Cong Lin
96b2c404aa [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0 am: d388582dff
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

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

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

Change-Id: I231fb4ac427072ef7804c88403d86564fd677968
2021-05-06 22:40:51 +00:00
Cong Lin
d388582dff [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

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

Change-Id: I7c03712343d6ab0db31b716232571f7074bd4f5e
2021-05-06 22:33:15 +00:00
Cong Lin
3a98f11e6f [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I964641f924512173dcb83b3fc3e685ee63c34397
2021-05-06 22:31:33 +00:00
Cong Lin
c1ce51690f [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d2ae3ebc37f7e6eff077ed2f7d560848cf29b04
2021-05-06 22:31:28 +00:00
Cong Lin
8eceff3037 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

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

Change-Id: Ifface1d7fbd00cca3436ad185611cbc3b21ca376
2021-05-06 22:30:47 +00:00
Cong Lin
1e032deed0 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: Ife464b7ee504a582a6ba62d47c826d1b4b5cf146
2021-05-06 22:24:35 +00:00
Cong Lin
1a3c6d7228 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I140d768a4af03f7b5d9a216007a3b252ae27f28d
2021-05-06 22:24:26 +00:00
Cong Lin
a84927cca8 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 5d1b215cb7 -s ours am: 23558d65b4 -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: I50db61137856d3411757c5749fd154e4497852a0
2021-05-06 22:22:10 +00:00
Cong Lin
23558d65b4 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 5d1b215cb7 -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: Iaf8cceab7ea631943c110149eb1bfdfd62830db2
2021-05-06 22:13:30 +00:00
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
b777a01117 [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: I5b6d660d2fb28d475f694d3c1f29c4e133d034a6
2021-05-06 21:55:56 +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
2695afcc94 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: Ib120d82bbca2d5852c992eca0f79a267ea2ef6c3
2021-05-01 01:08:21 +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
15662cb9c1 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: I59d10125317e298df41b8235953efc9f76aabae0
2021-04-30 19:30:38 +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
c3f1395994 Clean up other core CDM logs. am: 0579fe805e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: I71b3df3fbb720b340062ee567f7feec947ad6097
2021-04-29 09:39:13 +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