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

5113 Commits

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

Change-Id: I89e67dc6d460c457589cbb0a77c46ae4b5b4ee87
 2021-05-17 21:11:51 +00:00
Ulyana Trafimovich
7ca7e1b629 Merge "Disable dexpreopt and <uses-library> check for tests." into sc-dev am: 4b9ec9eab6 am: 2fe594f079 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14326926

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

Change-Id: I654d74a9e1b6db30d42e551fc4922bc0d752bfb7
 2021-05-17 21:03:11 +00:00
Rahul Frias
698fe8b9e1 Merge "Address CE CDM code review comments" into sc-dev am: 9b3e37b038 am: a8a59e5f7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14253246

Change-Id: I1d8893b18bcca78187dac0bb88e9e47212605625
 2021-05-17 20:52:31 +00:00
TreeHugger Robot
98ee102ef8 Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev am: 03dff71bd8 am: 63db607211 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14212412

Change-Id: I172bf8cd582e4581fc98c5e60a3504c198db5084
 2021-05-17 20:21:48 +00:00
Ereth McKnight-MacNeil
05f26fb422 Shell quoting in move_widevine_data.sh am: 63eae1f4a4 am: 0ef5d387f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13472583

Change-Id: Id3ab809856e0e0128ae790926b36c768544a885e
 2021-05-17 20:12:17 +00:00
Rahul Frias
6bc177a2bb Replace DeviceFiles::LicenseState with CdmOfflineLicenseState am: 4c4e746e57 am: 32286032e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14280044

Change-Id: I82d13f66b8b06f6941f08437fafe7e0407202e5b
 2021-05-17 19:46:58 +00:00
Rahul Frias
c6da67eed9 Merge "Correct request_license_test failures" into sc-dev am: 46a3f6c608 am: 9ee95389ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14263147

Change-Id: I57b88589f6cac935f7fe137543ad102a2783cb1e
 2021-05-17 16:04:46 +00:00
TreeHugger Robot
d13bce562f Merge "Clean up CdmEngine logs." into sc-dev am: bee62d797e am: a8ced08a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137667

Change-Id: I40974080fee5405855bf7dd6873e5232324ad6db
 2021-05-17 15:44:57 +00:00
Bob Badour
2712f282a8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: 99b73280e6 am: dc7573bb82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14284399

Change-Id: I48c1c798ac9ecf3aee610c61def026dd71edff97
 2021-05-17 15:36:15 +00:00
Edwin Wong
dd56243b29 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into sc-dev am: 8c0769d8a9 am: 25988720e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3983eb37b7283e5b2ac1c166253fada8e2fff292
 2021-05-17 15:11:24 +00:00
Edwin Wong
a7c9b9a0e1 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 68b5b00567 am: deece4f746 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc217420f8a19668b46ac5c20d1bc24d0c547e28
 2021-05-17 14:07:57 +00:00
TreeHugger Robot
95456f993b Merge "Use either spelling of AllocateSecureBuffer in dynamic adapter" into sc-dev am: 347bba5261 am: b8c670a32f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14150100

Change-Id: I78d396863427e67448a5b70dba2e5bcf9c1d9f94
 2021-05-17 13:47:18 +00:00
TreeHugger Robot
810c39ea75 Merge "Address review comments" into sc-dev am: 9c3c076cac am: db2c579afe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14207160

Change-Id: I6ad299dfed9751185572c198b5bc71feba0ec802
 2021-05-17 13:37:00 +00:00
Rahul Frias
1550faa8f2 Merge "Remove CBC1 and CENS test" into sc-dev am: c997497aa6 am: 93c6f6521a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14188281

Change-Id: I38b88028ae37a3bb62dab16110ed65a6613bacb7
 2021-05-17 12:43:55 +00:00
Alex Dale
761ffcab57 Merge "Only one function for reporting usage support." into sc-dev am: d4b24490f2 am: 73016e1f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137666

Change-Id: I4bb4834432a7203f17d73dfa5cbce0c5ed5b01aa
 2021-05-17 12:06:09 +00:00
Rahul Frias
a06545979e Merge "Address CE CDM test failures and code review comments" into sc-dev am: d59b009495 am: f83251974e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14123999

Change-Id: I8a4073ac100d0885d5bd379411f51da372922945
 2021-05-17 10:46:45 +00:00
Rahul Frias
d7c0e74297 Merge "Correct request_license_test failures" into sc-dev am: 5343a90f1f am: a90414daae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14185068

Change-Id: I233bd31c0345687430bde622c3f349ac5939b7a9
 2021-05-17 10:08:57 +00:00
TreeHugger Robot
6c3e2b22ae Merge changes Ic7459870,I655babf1,I463642fb,Iccdbcc0b,I2ebbd8f7, ... into sc-dev am: c1d423487f am: 6a3f8ee02d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14185071

Change-Id: I4000cdf76d390f07f5d7ab45c1def74badcd27f4
 2021-05-17 09:39:37 +00:00
Alex Dale
8cbc9e01c2 Merge "Extended Android file store error logs." into sc-dev am: 93cfe22910 am: a4332714bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13736812

Change-Id: Ia8e68e7f487963764dbfb40fe6fc14976d7e5709
 2021-05-17 07:52:58 +00:00
TreeHugger Robot
227d29064f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6183235585939e4e46fe539e5715b98b45526557
 2021-05-10 22:19:05 +00:00
TreeHugger Robot
ddaae9a17b Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev 2021-05-10 22:02:06 +00:00
Rahul Frias
e36c0754c9 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: I755b957f639ecba392728e1d39bd948d838d6fa4
 2021-05-07 22:34:29 +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
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
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
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
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
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
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
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
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
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
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