Alex Dale
8f3a3e3d23
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69 am: cb65c0c3e9 am: c2cc70b39a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: I3d1a49ecb9471536aa7d370fefa57685c175b386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 09:02:11 +00:00
Alex Dale
1cbf8b62be
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69 am: c63cd48183 am: 7eb7e0ae2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: I05326db6e64ca68075a0123ec309b4253939f158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:25:40 +00:00
Robert Shih
90911d2d51
dumpsys properties: fix indent & quotation am: 5036a0fc07 am: e530349352 am: b56e64c95a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564
Change-Id: Iac9a96fc2952e35370cdd6a0953759916476a4ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:00:37 +00:00
Robert Shih
d1c1c407be
dumpsys properties: fix indent & quotation am: 5036a0fc07 am: 9510e651ce am: dbb1d01b4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564
Change-Id: Idf96a01d5826b84f124eb2e1f6429415a166eccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:53:57 +00:00
Alex Dale
c2cc70b39a
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69 am: cb65c0c3e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: I3ee495a31eb5963494d796f3cf06d52c7d4cbdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 01:37:41 +00:00
Alex Dale
7eb7e0ae2d
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69 am: c63cd48183
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: If2dc5d78926918ce5fe2f13a7a32da26554cad06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 01:34:44 +00:00
Robert Shih
b56e64c95a
dumpsys properties: fix indent & quotation am: 5036a0fc07 am: e530349352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564
Change-Id: I842ed9a24214b33333ef17882e34b66df9b80e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 01:30:02 +00:00
Alex Dale
2084c51b63
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69 am: fa1bc9116d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: Idcb57c5ff074a4ba16f3b59d885ebe419ac5a869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 00:55:25 +00:00
Robert Shih
dbb1d01b4e
dumpsys properties: fix indent & quotation am: 5036a0fc07 am: 9510e651ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564
Change-Id: Ia38b30ce0d5a5df32b4a93601230c52c2d861775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 00:25:03 +00:00
Robert Shih
3c1592dca8
dumpsys properties: fix indent & quotation am: 5036a0fc07 am: 13077f55fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564
Change-Id: I45affad2ff3fc1a21e7c5828a395d0cd0caa6aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 23:56:47 +00:00
Alex Dale
cb65c0c3e9
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: I2f0f1f381f5d2c160e7aa896a03368ddb5b17812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:48:59 +00:00
Alex Dale
fa1bc9116d
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: Iff760bd5be57ecea2d9e2a5ca347e0b3430ff1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:47:39 +00:00
Robert Shih
13077f55fb
dumpsys properties: fix indent & quotation am: 5036a0fc07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564
Change-Id: Id25f8e04e88f9df0a69ca03d6e1b332f0be34b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:47:19 +00:00
Alex Dale
c63cd48183
Merge "Fixed WV metrics YAML formating." into udc-dev am: d09c640c69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22792935
Change-Id: I050336481ec1050146af149e1efeb80ff1e29778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:45:11 +00:00
Robert Shih
9510e651ce
dumpsys properties: fix indent & quotation am: 5036a0fc07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22822564
Change-Id: Id9d46a33050778cd3dd5c157599877bfffcd3174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:43:07 +00:00
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
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
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
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