Commit Graph

7849 Commits

Author SHA1 Message Date
Cong Lin
f3da766f94 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: fba535cdc2 am: 466c51765b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I6f15a09bf31fb54cec9fef471e901ffbee202984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:50:25 +00:00
Cong Lin
3ededa0edb Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: ce8676dae8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: Ic8b80b10a3c8fad150cbadfc3d50e60c69b1c422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:12:18 +00:00
Cong Lin
466c51765b Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: fba535cdc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I08806102fd2d872928789f94741d4e3052c4bcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:08:17 +00:00
Cong Lin
cb92ce96f6 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: 7256ccc161
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: Ic167c44103ff37b5c57cb0f0f6ab3719ea69e5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:07:39 +00:00
Cong Lin
fba535cdc2 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I8bb8cef564a18d0c2700d0df1931bbfa8bac682b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 03:28:57 +00:00
Cong Lin
7256ccc161 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: Iffe39839c4b5c43e680e6e1ad01fc7276cc7a516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 03:28:46 +00:00
Cong Lin
ce8676dae8 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I61c7cdbd3e279defc2863e558992a09335cade21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 03:26:20 +00:00
Cong Lin
9c42689506 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev 2023-04-26 02:57:21 +00:00
Kyle Zhang
1979978bdb Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: c0e6867a62 am: 0774f52581
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: I5dfcf76f9b92f893b1df0ce00c6c8429ce81e24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:56:10 +00:00
Cong Lin
b24df677f6 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b am: a0a5138a23 am: 9f7d27026b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: I9cd0b3f8742392e7d27d66842a2b04b5b9aa421e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:55:52 +00:00
Kyle Zhang
3b418d2d72 Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: 836a1f3d58 am: cd0debd0de
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: I87adba1d9769088eb88091356275ca9abf8dc8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:52:08 +00:00
Cong Lin
d667a6b311 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b am: c480c80ac2 am: 90724171f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: Icaf5f79cfff540d3c73deda29865439591dc9862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:51:51 +00:00
Kyle Zhang
9a44708e37 Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: a15cf030ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: If7bba9c5626fd60e3f8f2fc4fca2de91f3f48d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 20:20:17 +00:00
Cong Lin
134347adc0 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b am: c252d79287
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: If70b3c6addb6a2c17dcf5027d5d27ec66fb959c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 20:19:55 +00:00
Kyle Zhang
0774f52581 Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: c0e6867a62
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: Ic0bd58c5faa67d15758bbce295c4340626a5c42a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 20:18:01 +00:00
Cong Lin
9f7d27026b Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b am: a0a5138a23
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: I3dddbcc2ddc06d5e5f762b02e535706a3cda22d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 20:16:41 +00:00
Kyle Zhang
cd0debd0de Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: 836a1f3d58
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: I81134aecd1bd7996d5bc5fefee4b3535da68be34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 19:37:12 +00:00
Cong Lin
90724171f6 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b am: c480c80ac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: Iccfbf818ded17cad00888b08674d67522a530072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 19:36:57 +00:00
Kyle Zhang
a15cf030ea Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: Ib2d13d10599f4d831ed9c6c88d6597dc1de2ee0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 19:01:45 +00:00
Cong Lin
c252d79287 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: Ief9d17bbe725fe43f76dac3da4e36b409dfbcd62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 19:00:46 +00:00
Kyle Zhang
c0e6867a62 Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: I3566c233739ab4069356898143ad53abd84f33f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 18:56:38 +00:00
Cong Lin
a0a5138a23 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: I984014de0291c32139677c64413b581da91175e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 18:55:28 +00:00
Kyle Zhang
836a1f3d58 Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: Ie3fda41df89aaadffc4c7c1a49c65b32b077f2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 18:50:30 +00:00
Cong Lin
c480c80ac2 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: Ib0617e036bdddb5c192245e87ba6ee531515b5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 18:48:41 +00:00
Kyle Zhang
6fda7dfc49 Merge "Set drm@latest to widevine service NOT apex" into udc-dev 2023-04-25 18:47:14 +00:00
Cong Lin
8c0e7f2ba3 Factory extraction tool: Use device info from OS property when TEE returns empty
Similar change is merged to widevine internal tool: ag/22824076

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: I055ee0994d9dbbbf9c0c0875670a449a56a3e29e
2023-04-25 18:23:09 +00:00
Cong Lin
7e3821885b Merge "Use device info from OS property when TEE returns empty" into udc-dev 2023-04-25 18:22:02 +00:00
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
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