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

6513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Bruce
9063559c43 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I34a211b4f201580a227c3c0f725d12244d244abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:39 +00:00
Alex Dale
cae67a0b19 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ie78be345758fc67e01f185a01fe91119abfb61e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:00:18 +00:00
Alex Dale
beddef3475 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I440cb42578dbf320ea192a540329d9401b52a5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:00:02 +00:00
John Bruce
7d78ce9ac8 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev 2022-04-29 17:38:39 +00:00
Alex Dale
38b639f920 Merge "Specify DRM certificate duration in tests." into tm-dev 2022-04-29 17:34:59 +00:00
Robert Shih
c9c897408a Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa am: 7c8c12797a am: 9cd58c8832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I67560710d885ede9d7a0f5804a3e96a7a7bd0619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:22:07 +00:00
Robert Shih
8a2774d569 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 am: 9a66b5a614 am: b7ca3947e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: If2309066e288e7ac0313d8b4f984346f81c1fc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:07:54 +00:00
Robert Shih
92ed2f07ac Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: 965a198106 am: 02a3668fc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I8738229632e0d8f530d0caff3648cba817810c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:53:56 +00:00
Robert Shih
9b4068e57b Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 34d9771f06 am: f65d971118 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I3d5fa178e26355b5730044a5c096a208616e7dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:03:20 +00:00
Robert Shih
9136ff312a Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: dbf6986c98 am: aee8d5f57e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Idd77d9133e83392decf4dc22f14e64c6074ea278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 02:18:04 +00:00
Robert Shih
07ece938fe Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 6b54740110 am: cad8ff6aab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I1a5de2b42615288db32522eb106055cedef727aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:06:38 +00:00
Robert Shih
9cd58c8832 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa am: 7c8c12797a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Ic3eb8121cbe002ed75f05306c8910886750195a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:47 +00:00
Robert Shih
b7ca3947e6 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 am: 9a66b5a614 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I7cbfbb33befb785c0a50ef49bb4b70d7cc3c1226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:34 +00:00
Robert Shih
02a3668fc8 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: 965a198106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Ifccaea031bb21f4a47b33cd4c1a2ce75e033735a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:08 +00:00
Robert Shih
f65d971118 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 34d9771f06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: Ie929c02c8e5e258922e7e3b33cbedaffc57ed6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:14:15 +00:00
Robert Shih
aee8d5f57e Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: dbf6986c98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I2c99174f69063d88d7f8138b35ae6c2fd699ed7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:13:33 +00:00
Robert Shih
cad8ff6aab Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 6b54740110 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I0477dc3a81c18cee2971695ed99444e58ec12a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:13:26 +00:00
Robert Shih
7c8c12797a Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Id29cc4e198a89e52ddc88f91a1b9343850d871af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:11:14 +00:00
Robert Shih
9a66b5a614 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I884a2db9719e069705e1ee422aa694ed3926dd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:10:49 +00:00
Robert Shih
965a198106 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Icb1e0942b54fa39ffb541b22a04d0ab2ead8e917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:09:13 +00:00
Robert Shih
dbf6986c98 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I61adb53f7b9303fdd305596b138892ef6d18de9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:09:11 +00:00
Robert Shih
34d9771f06 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: Ifcd11fecace4529cac7053f4d44408980a2b4201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:57 +00:00
Robert Shih
aeef8cc0e7 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 5c15da7afc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I393967ede53cf655dfb7966be610a6dcbceca5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:46 +00:00
Robert Shih
6b54740110 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I31c1eadee8026d82df07780d4328a3ab07a52ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:40 +00:00
Robert Shih
eee7bc58be Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 2212311d21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I0647aef166fd25590187c308b23c791da3b6917e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:08:38 +00:00
Robert Shih
470f49f87c Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I57a2da0c868d7e26c655115a4f6bd08197d32d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:44:57 +00:00
Robert Shih
fbec9a1c8b Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I8591e0f7fac5a499165ae45634d2989d54bdc06e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:44:32 +00:00
Robert Shih
5c15da7afc Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Id1f9debd87340d9df72e7a97f06acf51551843c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:54 +00:00
Robert Shih
71a89e2daa Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I75fff489cf7945b9aca39990ceea1ea34f08c35a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:30 +00:00
Robert Shih
2212311d21 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: Ia8b63e21ccd0b519fc11046a278bc5f2e0128e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:30 +00:00
Robert Shih
022c86d666 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I7841f278f3e70bb0513c7bfa0b889e4f6a2b0376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:43:13 +00:00
Robert Shih
5c38b38514 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev 2022-04-27 21:23:53 +00:00
Robert Shih
3b44c810d6 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev 2022-04-27 21:23:47 +00:00
Alex Dale
f696a48318 Logging CDM session ID on Decrypt() failures. 
[ Merge of http://go/wvgerrit/149690 ]

This changes extends the CryptoSession logging to include the OEMCrypto
session ID in its decrypt failure logs, and adds a new CdmSession
decrypt failure log which includes the CDM session ID.  The CDM session
directly maps to the MediaDRM session ID, making app debugging easier.

The Decrypt() code pathway is one of the most frequently called
portions of the CDM code, and the pathway attempts to make as few
logging calls as possible in order to keep latency low and log
verbosity to a minimum.  It is anticiapted that when a call to
Decrypt() fails, there will be a burst of failures as the app may
make several calls to Decrypt() before handling the first decrypt
error.

To keep logging low, the following rules are followed:
- CryptoSession: decrypt errors are only logged when the decrypt error
  changes.
- CdmSession: decrypt errors are only logged when the last call to
  decrypt had succeeded.

Bug: 183984396
Test: MediaGTS with decrypt failures
Change-Id: Ic6124646d129efbc8a690b5bfd4dc422e04e677b
 2022-04-26 21:23:12 +00:00
Robert Shih
5a1d5e8837 WVCdm: no destroy global log buffer on exit 
[ Merge of go/wvgerrit/149989 ]

Bug: 227848537
Change-Id: I9407b133654c20ddcd3c15404dd19b3719064e6e
Test: Irdeto monkey test
 2022-04-26 16:57:13 +00:00
John "Juce" Bruce
c823a85e7d First-stage Provisioning 4.0 client ID encryption 
(This is a merge of http://go/wvgerrit/150131 to the Android repo.)

This patch changes the code path in the CDM so that the first-stage
provisioning request for Provisioning 4.0 is always encrypted with the
Widevine service certificate instead of the client-set service
certificate, reflecting that the first-stage provisioning is always
handled by Widevine.

This patch also makes several methods on the ServiceCertificate class
const. This has no impact on their behavior.

Bug: 221443151
Test: prov40 tests
Change-Id: Ide4c3927afadcd45ae7fb629b99e2f55cc29d56e
 2022-04-25 17:33:53 -07:00
Alex Dale
a80a9fef26 Added mutex for reserved_license_ids_. 
[ Merge of http://go/wvgerrit/150630 ]

DeviceFiles uses a static variable for tracking license IDs which
have been reserved by a CDM session before officially storing the
license on the device.  This variable was not protected by a mutex,
and a rare race condition would arise, either crashing the service
or getting it stuck in a loop.

This CL adds a mutex for protecting the set of reserved IDs.

Bug: 226555704
Test: device_files_unittest
Change-Id: Icdea88673c76c267b4b7db79697ec52ae8e2581e
 2022-04-22 13:53:11 -07:00
Robert Shih
b573e138ce Widevine PRODUCT_PACKAGES makefiles 
Bug: 170611688
Bug: 228299194
Change-Id: I6f63e271f53cc76af91b4b8b6474e3a3e53ee800
 2022-04-22 16:35:07 +00:00
Alex Dale
cc35c64757 Specify DRM certificate duration in tests. 
[ Merge of http://go/wvgerrit/150350 ]

Certain integration tests were depending on the provisioning server
only sending short duration (~2 minute) certificates when testing
the CDM's ability to enforce expiration periods.  This behavior of
the server was not reliable, resulting in device test failures from
server behavior changes.

The DRM certificate provisioning server allows the requester to
optionally provide a desired certificate duration in the request
URL.  The tests which test the CDM's ability to enforce certificate
durations will now explicitly specify the certificate duration
required by the test.

Bug: 228547158
Test: request_license_test
Change-Id: Ib9ebfdba1451104be0e59baca0b2f23a94cd51e6
 2022-04-15 20:14:51 -07:00
Edwin Wong
a9fb043c6d Merge "Add unit tests for AIDL service" into tm-dev am: 47ebc28f6a am: 56d976fec6 am: e3e1e770c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17641620

Change-Id: Ic3a3aa95aedb60b8433dd3738e5f2f6a9216d8cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:39:58 +00:00
Edwin Wong
5f12f00956 Merge "Add unit tests for AIDL service" into tm-dev am: 47ebc28f6a am: 6ea9e7212b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17641620

Change-Id: I9acc2ec4cbc5673a0c515da1aabccb62e4f00fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:24:47 +00:00
Edwin Wong
e3e1e770c1 Merge "Add unit tests for AIDL service" into tm-dev am: 47ebc28f6a am: 56d976fec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17641620

Change-Id: I7fdcd69c46135f2179a01e6eaec19b6d59595872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:16:31 +00:00
Edwin Wong
6ea9e7212b Merge "Add unit tests for AIDL service" into tm-dev am: 47ebc28f6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17641620

Change-Id: I3bc1fe88cb20d250f16b652e2a0d214adf240d0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:07:07 +00:00
Edwin Wong
56d976fec6 Merge "Add unit tests for AIDL service" into tm-dev am: 47ebc28f6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17641620

Change-Id: Icb4f82445784ecf441355f9ba12ad2071776582d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:49:07 +00:00
Edwin Wong
47ebc28f6a Merge "Add unit tests for AIDL service" into tm-dev 2022-04-14 17:26:44 +00:00
Alex Dale
7233b09aca Added OTA Keybox stress test. am: 8cab20c0c5 am: 5fb6be161e am: ed5d7da8e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17549231

Change-Id: Ic4e329106a1b62e6ce90d551285798f8307ad34c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 02:30:21 +00:00
Alex Dale
5dec86a191 Added OTA Keybox stress test. am: 8cab20c0c5 am: 6989567e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17549231

Change-Id: I1d108e072004782a9b97338ec5530bffef470953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 01:23:58 +00:00
Alex Dale
ed5d7da8e7 Added OTA Keybox stress test. am: 8cab20c0c5 am: 5fb6be161e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17549231

Change-Id: I0032ab0758e650f5db2ab833b8dd4c16d799807a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 01:23:41 +00:00
Alex Dale
5fb6be161e Added OTA Keybox stress test. am: 8cab20c0c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17549231

Change-Id: Id9068c7e935ecd5a7a0475da99db3dba48dac874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:59:33 +00:00
Alex Dale
6989567e5e Added OTA Keybox stress test. am: 8cab20c0c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17549231

Change-Id: Ifdf69d27cde619bd757445f10221c3cee5b590ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 00:58:28 +00:00