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

7357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Shih
e530349352 dumpsys properties: fix indent & quotation am: 5036a0fc07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564

Change-Id: I2a0bf13393419fc6bb1a5f98a55431d5af2611e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:38:15 +00:00
Alex Dale
d09c640c69 Merge "Fixed WV metrics YAML formating." into udc-dev 2023-04-24 22:04:34 +00:00
Cong Lin
65f50d4662 Use device info from OS property when TEE returns empty 
Some mandatory device info fields like manufacturer can be empty string
when returned from TEE on devices which have not been provisioned with
attestation IDs.

The extraction tool also needs to check for empty string in the
response, and if so, populates the field with Android property values.

Test: extracting device info from new Pixel EVT 1.1 and uploading
Bug: 276958001
Change-Id: I6e1b3dee8ffcd991335bc50b59a0c80f030cdc79
 2023-04-24 14:14:42 -07:00
Robert Shih
5036a0fc07 dumpsys properties: fix indent & quotation 
[ Merge of go/wvgerrit/c/cdm/+/171352 ]

Bug: 239462891
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -p
Change-Id: I0b9ea26a4027b7fbbd277536c0e705885eef408e
 2023-04-24 12:54:11 -07:00
Robert Shih
69b9ed8972 Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc am: 6353e693c5 am: 71924c2564 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: I605e351c21408965e4e9ce13b342884793b92ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 22:11:21 +00:00
Robert Shih
71924c2564 Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc am: 6353e693c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: I9ec065f4384a03076cca51c0125b11db97e30cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 22:08:25 +00:00
Robert Shih
ef97005dd5 Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc am: 4edfacc073 am: fa57f135c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: Ie906ec6398e2226888c935aeee3c46b9aa7d8bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 22:00:27 +00:00
Robert Shih
0eec5a8088 Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc am: ff346a7bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: Ie401a12a18232708dd85b9b28196f50446017e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 21:41:36 +00:00
Robert Shih
fa57f135c1 Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc am: 4edfacc073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: I5d1404ef32af98ac5fe43da5717ac14488df1cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 21:38:36 +00:00
Robert Shih
6353e693c5 Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: Ic72533b8f858e36b61586caee345b6f4b866c8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 21:19:40 +00:00
Robert Shih
ff346a7bea Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: Idad157296d2853f2a8e1cc9bff36ae425c406559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 20:59:52 +00:00
Robert Shih
4edfacc073 Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352

Change-Id: Iaa9c756eb7a5178e261102c4328e5aa32c547255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 20:57:14 +00:00
Alex Dale
1e1f11f5b1 Fixed WV metrics YAML formating. 
[ Merge of http://go/wvgerrit/171270 ]

The metrics dump tool for the Widevine DRM factory was producing
malformed YAML output.  This is compounded by the formatting using
fixed indentation for its output.

Bug: 239462891
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: atest GtsMediaTestCases
Change-Id: I784d107085721ad0dabe94bdab33e9cc073f98e4
 2023-04-21 13:32:52 -07:00
Robert Shih
a658e076dc Merge "Return apex name for PROPERTY_VENDOR" into udc-dev 2023-04-21 19:37:03 +00:00
Kyle Zhang
e362704180 Create different targets for each Widevine apex 
Bug: 277764729
Change-Id: I7c8599ba55ba75b092b14ddb88553735f02cdaa0
 2023-04-21 17:05:38 +00:00
Jooyung Han
71781924e8 Fix prebuilt apexes 
- Add vendor:true
- Use use_soong_config_var to toggle prebuilt/source_build

Bug: 251299786
Test: SOONG_CONFIG_widevine_module_source_build=false m \
        com.google.android.widevine
Change-Id: If835b443a825dcab1ec09aaa21001602e9b53d20
 2023-04-21 17:05:11 +00:00
Automerger Merge Worker
3781dfbeff Merge "Fix spurious wake up in dynamic adapter am: 5ccb147bb8 am: dbb3775757" 2023-04-20 23:05:16 +00:00
Cong Lin
0b70d8bd45 Fix spurious wake up in dynamic adapter am: 5ccb147bb8 am: dbb3775757 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: Iafbda7d19396a6afebfb198ea2199dc290c02a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 23:05:13 +00:00
Cong Lin
36a07f8686 Fix spurious wake up in dynamic adapter am: 5ccb147bb8 am: 6f9245c7ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: I773cfe69e1cd3aa5e63aeb2d957ecfd06afb70bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 23:05:07 +00:00
Cong Lin
6f9245c7ff Fix spurious wake up in dynamic adapter am: 5ccb147bb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: I13739218a8050fa2ec04ec52848e9dd96e712fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 22:27:02 +00:00
Cong Lin
dbb3775757 Fix spurious wake up in dynamic adapter am: 5ccb147bb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: Ic6cee6974f33b2b3fc263c43ba8e82d8cb3ea5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 22:26:59 +00:00
Cong Lin
5ccb147bb8 Fix spurious wake up in dynamic adapter 
The predicate version of wait_for() to avoid spurious wake up by
checking running_ status.

This is a fix to ag/21439870

Test: build widevine
Bug: 272424659
Bug: 271811708
Change-Id: I446fef8f4c8c58bcd47b885dba50643b3e5e1185
 2023-04-20 19:16:19 +00:00
Kyle Zhang
555b381e81 Set drm@latest to widevine service NOT apex 
Bug: 277761241
Change-Id: I71f8a7e6b6a1c3cce24a8b33e0bb7748bbdd7230
 2023-04-20 17:29:54 +00:00
Treehugger Robot
f97e8dd55d Merge "fix widevine fuzzer: c++_static and cc_fuzz" 2023-04-18 00:56:41 +00:00
Cong Lin
3e44db9d56 Re-generate Android L3 after zero-initializer fix am: efd05207c8 am: f8f75c148b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22653062

Change-Id: Id094ba186fad513c448b85fdfb346cc151d3fc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 19:03:38 +00:00
Cong Lin
f4f5a32799 Re-generate Android L3 after zero-initializer fix am: efd05207c8 am: 7a70e1baf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22653062

Change-Id: I9c905f15f95683fe406e409834268dd21e5fa5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:56:02 +00:00
Cong Lin
f8f75c148b Re-generate Android L3 after zero-initializer fix am: efd05207c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22653062

Change-Id: I35c7fdeae9978b0cf56d16c2de8b6a6c7379723a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:36:00 +00:00
Cong Lin
7a70e1baf6 Re-generate Android L3 after zero-initializer fix am: efd05207c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22653062

Change-Id: I0628f545d8150cac036d17b63c4beacc08a147ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:15:20 +00:00
Cong Lin
efd05207c8 Re-generate Android L3 after zero-initializer fix 
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/170631

Original fix:

Array intializer "= {0}" may involve compiler specific behaviors which
can cause haystack hang on arm32 target. Fix is to use memset() instead.

Test: debug build verified on arm32 device
Test: Ran GTS media tests on Pixel 7
Bug: 274637461
Change-Id: I02f5df232934e0c78e259c85e4faf313c01c0b6b
 2023-04-14 12:38:49 -07:00
Rahul Frias
20eba84290 Merge "Force a reprovisioning on device renewal" into udc-dev am: 333fe249e4 am: dbf42e9492 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22360386

Change-Id: I799820ad2eedb328ade82e7d3af83ad1d805c913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 06:41:18 +00:00
Rahul Frias
3c4c7bbd16 Merge "Force a reprovisioning on device renewal" into udc-dev am: 333fe249e4 am: 9294de2771 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22360386

Change-Id: I75abd460742ae8b61dfb24e99f468b34eecc1456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 06:40:50 +00:00
Rahul Frias
dbf42e9492 Merge "Force a reprovisioning on device renewal" into udc-dev am: 333fe249e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22360386

Change-Id: I264e34cc935d8df45f19c06aa349a88c00b7e4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 06:10:51 +00:00
Rahul Frias
9294de2771 Merge "Force a reprovisioning on device renewal" into udc-dev am: 333fe249e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22360386

Change-Id: I45da5b212de4ba8049bf0abc258b7f532f4b4590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 06:10:47 +00:00
Rahul Frias
333fe249e4 Merge "Force a reprovisioning on device renewal" into udc-dev 2023-04-14 05:49:14 +00:00
Steven Moreland
680b990aee fix widevine fuzzer: c++_static and cc_fuzz 
c++_static and cc_fuzz interact badly

Fixes: 275500903
Test: widevine fuzzer starts and runs
Change-Id: I06b89b710c6f1f11d05756651391df3f682f872b
 2023-04-14 00:49:37 +00:00
Robert Shih
d258acb879 Return apex name for PROPERTY_VENDOR 
[ Merge of go/wvgerrit/c/cdm/+/170370 ]

Bug: 277620071
Test: WidevineHalTest
Change-Id: I05385358875723e20b13d3abb21a0deee9f35c29
 2023-04-12 15:36:38 -07:00
Alex Dale
bdc2668f9b Moved OEMCryptoResult string converter. am: de779e7545 am: 324907a296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: I8a5de1ba6449fa1034e61c877f6de40e1f172aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 03:00:10 +00:00
Alex Dale
a3e4ce17c1 Moved OEMCryptoResult string converter. am: de779e7545 am: e168e35355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: I4d962828ebe521f2a2aa24926b80eadeed10f326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:59:25 +00:00
Alex Dale
324907a296 Moved OEMCryptoResult string converter. am: de779e7545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: Ic2cc0826602fdb1f53f2b8cf4185ecb3cd459048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:27:42 +00:00
Alex Dale
e168e35355 Moved OEMCryptoResult string converter. am: de779e7545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: I012477d1bc83989bb558ddf41efc0d52da7afa08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:27:01 +00:00
Alex Dale
de779e7545 Moved OEMCryptoResult string converter. 
[ Merge of http://go/wvgerrit/170073 ]

Removed the file "error_string_util.cpp" and its header, moving the
OEMCryptoResult to string converter to "wv_cdm_types.cpp".  This extra
file served little purpose, and created a dependency on the CDM utils
to the CDM itself.

This is part of the effort to fix the formatting of WV metrics; making
enum-to-string conversion uniform throughout the CDM.

Bug: 239462891
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: Manual testing with Google TV
Change-Id: I4bf95d26b623f5b8fa86bdb2578cbc4ee65125cb
 2023-04-11 14:08:30 -07:00
Cong Lin
6e1a7fad4c Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 am: a5a7d77896 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: I4d6013798814367ea8dff67d4e02ad1ea5fa3b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 20:12:26 +00:00
Cong Lin
e8a33c1ab2 Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 am: 83edd1b853 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: I951536e50d052201052023a942ee0b9de64d66a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:48:35 +00:00
Cong Lin
a5a7d77896 Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: I6c54961f0755ef911496e18819c6355fc5e97fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:35:03 +00:00
Cong Lin
83edd1b853 Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: Idd4e6479bd1e3eb10669f07d24456b43b1a77a07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:20:06 +00:00
Cong Lin
9c844682a6 Merge "Fix invalid key session id" into udc-dev 2023-04-05 17:41:43 +00:00
Rahul Frias
d31a4dec56 Force a reprovisioning on device renewal 
[ Merge of http://go/wvgerrit/169374 ]

Device renewals used to require that OEMs remove provisioning
certificates as part of the OTA update process. Instead, a change
in system ID is relied upon to indicate a change in root of trust.
If a change in System ID is detected, reprovisioning will be forced.

This is not enabled for ATSC devices or L3 devices. For the latter a
change in system ID may occurs without a change in RoT.

Bug: 258361396
Test: GtsMediaTestCases
Change-Id: I6e8b0b2149fc2ed5362a32bb6e869826f5fa8ef7
 2023-04-05 08:30:47 -07:00
Cong Lin
1b5bf5a71a Fix invalid key session id 
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/169871

The default invalid entitled key session id was 0, which in fact could
be a valid value depending on how the key session id is allocated by the
implementation. This can be a possible cause of L3 entitled key session
failure since L3 can recycle a regular oemcrypto session id 0 and
re-assign it to an entitled key session later.

Bug: 264688931
Test: Run GTS media tests

Change-Id: Iae79d08378d61be8a3402f606992765f24298508
 2023-04-05 00:34:40 +00:00
Kyle Zhang
4587659c5a Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev am: 0ab8f029a0 am: 535e6e8832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22323332

Change-Id: I1d733d8486ba56d7c75a7396eccc9f5341231255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 21:23:28 +00:00
Kyle Zhang
ad573f7993 Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev am: 0ab8f029a0 am: 0676c30cdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22323332

Change-Id: Ic1ca3cc6521e97f82bdaff5eb7770d03725af409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 21:22:00 +00:00