Commit Graph

4734 Commits

Author SHA1 Message Date
Edwin Wong
8ac53ecf87 Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d am: f596c0929e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: Iecc5344c3f153fa085faeda6e526c7432d960038
2020-06-17 01:14:25 +00:00
Edwin Wong
2efe1ab43a Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d am: 656db1857b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: Ia81efaffabcb99ab931a8538aa39d88fbf3f5835
2020-06-17 01:14:13 +00:00
Edwin Wong
456caca048 Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d am: 656db1857b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: I3bf7e672c918824a493402022d54c317f02655f6
2020-06-17 01:14:02 +00:00
Edwin Wong
66a17f743d Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: Ie60e80a4bc2199bddaa4f27f39e6b0207629baef
2020-06-17 01:00:10 +00:00
Edwin Wong
f596c0929e Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: I9969623efb2098fecdd9cfd5d38e3477a37dabed
2020-06-17 01:00:02 +00:00
Edwin Wong
656db1857b Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: I3b1f5fa74f157d7ffc336ec53f61f6dacf29d2d9
2020-06-17 00:59:46 +00:00
Edwin Wong
6b8d0e034d Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev 2020-06-17 00:47:04 +00:00
Edwin Wong
72dc93ed1d Add v16 Widevine Integration Guide Android Supplement
The doc is based on
WidevineSecurityIntegrationGuideforCENCAndroidSupplement_v15.pdf.
The "Build Files" and "Reference Implementation" sections are
updated for v16.

merged from http://go/wvgerrit/101747

Please see revision history in:
https://docs.google.com/document/d/19pSOpV5_6AtyK82p1b5DajlYZnVOfyL63p5h72yWW5k/edit?usp=sharing

Test: revision history

bug: 147596889
Change-Id: If3e9fc6bb268d1d3be62b56e2e43752d8df3fc03
2020-06-16 15:19:34 -07:00
Edwin Wong
342cf391d1 Merge "Add lshal debug hook." am: 7d0c14a15e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11770468

Change-Id: I63d55dfa875238211e712072fdee3c9d43c3b467
2020-06-16 17:17:07 +00:00
Edwin Wong
7d0c14a15e Merge "Add lshal debug hook." 2020-06-16 17:01:30 +00:00
Rahul Frias
d8c5732987 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: bde967aa74 am: b06a92f6b3 am: c4ec93820f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: Idd4d07fc4bf0721d62c5b481fce4394cc398b15f
2020-06-16 09:32:02 +00:00
Automerger Merge Worker
4df6b84c6f Merge "Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 4868f95704" into rvc-d1-dev-plus-aosp am: 0e2311c1ed am: c70e1dad33 am: f077d4d5f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: If60d2ac4807f8c7520392d0e040cae4f48edade6
2020-06-16 09:31:57 +00:00
Rahul Frias
63d858354b Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: 1c6633d408 am: 7b0fe07c8a am: 7589364dc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I18a53027e0a0de7e714f4e7a506301546bb27f5c
2020-06-16 09:31:51 +00:00
Rahul Frias
c4ec93820f Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: bde967aa74 am: b06a92f6b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I2d04248277cf1cb7511735cec0f0a4013a5993ec
2020-06-16 09:22:20 +00:00
Automerger Merge Worker
f077d4d5f9 Merge "Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 4868f95704" into rvc-d1-dev-plus-aosp am: 0e2311c1ed am: c70e1dad33
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: Ic524693d03e4e266e8380da0db69142138b6cc0e
2020-06-16 09:22:15 +00:00
Rahul Frias
7589364dc6 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: 1c6633d408 am: 7b0fe07c8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: If47d215914fbb11d2d33cd01b635d4fe16112957
2020-06-16 09:22:07 +00:00
Rahul Frias
b06a92f6b3 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: bde967aa74
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I849a4eb13be06383dd40f2f4ccf0643c5db099b5
2020-06-16 09:18:10 +00:00
Automerger Merge Worker
c70e1dad33 Merge "Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 4868f95704" into rvc-d1-dev-plus-aosp am: 0e2311c1ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: Ie5a188241e664b62e057f9e739bb1acfedf1153d
2020-06-16 09:13:16 +00:00
Rahul Frias
7b0fe07c8a Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: 1c6633d408
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I48c5b7cc50c94e78b9aa9f65748d5fa51fc949ea
2020-06-16 09:12:57 +00:00
Rahul Frias
bde967aa74 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I0bdb926501259cce1a74c631bd284a7a8073fa9d
2020-06-16 09:07:19 +00:00
Automerger Merge Worker
0e2311c1ed Merge "Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 4868f95704" into rvc-d1-dev-plus-aosp 2020-06-16 09:03:36 +00:00
Rahul Frias
82c6448e9c Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 4868f95704
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I2433ef31b467cfda8396743db887169c8bd5a218
2020-06-16 09:03:32 +00:00
Rahul Frias
1c6633d408 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I31070cfbc0f7f8742fea3dc5e25c1328df68de22
2020-06-16 09:03:23 +00:00
Rahul Frias
4868f95704 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I3e94398b1ae4670f33a3c128e653e38d2baaa525
2020-06-16 08:54:41 +00:00
Rahul Frias
041132b76d Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: If178f2506cd8b439a08d23577029a54bf9aae3d6
2020-06-16 08:54:40 +00:00
Rahul Frias
0db9b974c2 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I59aa80b62824a29a8350b99a8f9a35d193aa968e
2020-06-16 08:54:27 +00:00
Rahul Frias
05fbb3dd87 Merge changes I295f66f9,I142f286c into rvc-dev
* changes:
  Add ATSC support - part 2
  Add ATSC support - part 1
2020-06-16 08:46:02 +00:00
Automerger Merge Worker
d6fd82aaf8 Merge "Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8" into rvc-d1-dev-plus-aosp am: 9833b1e86d am: 70d0761ed6 am: 3ce4e8a289
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: Icab9207d4b02c48fd951a96a7ac3806d1e753ca3
2020-06-16 02:59:11 +00:00
Fred Gylys-Colwell
1949d9327c Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8 am: 8dafa15521 am: 98187ae858 am: 21369e4444
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I2e4536c7c57310ee08292c1ceb39feb028dd11da
2020-06-16 02:58:55 +00:00
Fred Gylys-Colwell
d20e56ed13 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: d0259e0942 am: 8ff9d2255d am: 6926815f29 am: 63190628a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: Idf3ae36dfdddc127355c018481e9b066ef77acb4
2020-06-16 02:58:33 +00:00
Automerger Merge Worker
3ce4e8a289 Merge "Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8" into rvc-d1-dev-plus-aosp am: 9833b1e86d am: 70d0761ed6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: Ie6f45d1786db31e39fca12e64c9452d0cb5a6be1
2020-06-16 02:46:52 +00:00
Fred Gylys-Colwell
21369e4444 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8 am: 8dafa15521 am: 98187ae858
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: Ib4b6a265e81871bc4bc6a322c4406178f9c9f071
2020-06-16 02:46:46 +00:00
Fred Gylys-Colwell
63190628a6 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: d0259e0942 am: 8ff9d2255d am: 6926815f29
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I41d1223029e7ca0360f253c811f3a60c210b69b0
2020-06-16 02:46:01 +00:00
Automerger Merge Worker
70d0761ed6 Merge "Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8" into rvc-d1-dev-plus-aosp am: 9833b1e86d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I6851edd39289b33f5ab4d2b159f6d1ec8d8133a8
2020-06-16 02:34:00 +00:00
Fred Gylys-Colwell
98187ae858 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8 am: 8dafa15521
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I5ac8eae550901fac5734f582279ce73e96f98e75
2020-06-16 02:33:48 +00:00
Fred Gylys-Colwell
6926815f29 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: d0259e0942 am: 8ff9d2255d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I9fb4b3beddb2cf7c649420ca3ae22d9c5124d85a
2020-06-16 02:33:41 +00:00
Fred Gylys-Colwell
8dafa15521 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I0c42f412da1de1624577700887db1f6bd7ca937c
2020-06-16 02:20:30 +00:00
Automerger Merge Worker
9833b1e86d Merge "Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8" into rvc-d1-dev-plus-aosp 2020-06-16 02:20:20 +00:00
Fred Gylys-Colwell
1ee911150a Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I47571f3ab78d1e917f3361258b3c29ee1f4883c4
2020-06-16 02:20:16 +00:00
Fred Gylys-Colwell
8ff9d2255d Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: d0259e0942
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I90988810cb3a1e5443ca58fe65a9ddb775e6f326
2020-06-16 02:20:15 +00:00
Fred Gylys-Colwell
859038e6c8 Remove Android.mk for OEMCrypto ref code am: 119932ea69
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: Iab024d334ba53aacd6813a350749f6a31568d635
2020-06-16 02:12:45 +00:00
Fred Gylys-Colwell
a8e2f398ad Remove Android.mk for OEMCrypto ref code am: 119932ea69
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I6eb3a9794f19995823f659790e7316ed45e3841a
2020-06-16 02:12:37 +00:00
Fred Gylys-Colwell
d0259e0942 Remove Android.mk for OEMCrypto ref code am: 119932ea69
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I3eba5d14aa17dc70888964154b11e70ff7e6bdbc
2020-06-16 02:12:30 +00:00
Fred Gylys-Colwell
119932ea69 Remove Android.mk for OEMCrypto ref code
Merge from Widevine repo of http://go/wvgerrit/101905

The reference OEMCrypto should not be built as part of Android.

Test: Builds
Bug: 146361995
Change-Id: Ic25e6e567fcac519636f64dabc0d59b3df78990e
2020-06-15 17:40:28 -07:00
Dan Willemsen
8128c5c133 Replace libcrypto_static with libcrypto am: 761d1723ff am: abf67e2910 am: 927ef46152 am: 1d881bf5ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11815604

Change-Id: Ie5a65c22bce7ee0c873a804b3529c3338db6b704
2020-06-15 20:31:04 +00:00
Dan Willemsen
1d881bf5ad Replace libcrypto_static with libcrypto am: 761d1723ff am: abf67e2910 am: 927ef46152
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11815604

Change-Id: Ia4d772b9ee248979e8efebf9bea01da41400330c
2020-06-15 20:16:46 +00:00
Dan Willemsen
927ef46152 Replace libcrypto_static with libcrypto am: 761d1723ff am: abf67e2910
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11815604

Change-Id: Ie3a6d8648842d1a1f6cd0dfcf70927b7cedf7b57
2020-06-15 20:10:51 +00:00
Dan Willemsen
abf67e2910 Replace libcrypto_static with libcrypto am: 761d1723ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11815604

Change-Id: If659bab9de0b6878e21035aac6b99c4d4bf83e15
2020-06-15 20:00:10 +00:00
Edwin Wong
53e8348860 Add lshal debug hook.
[Merge of http://go/wvgerrit/101804]

Dump build info and Widevine DRM service properties.

Test: adb shell lshal debug [drm service]
  adb shell lshal debug android.hardware.drm@1.3::IDrmFactory/widevine

Bug: 154027349
Change-Id: Ide918d7bab7a59c1564ccec57cbfef1fff9e5f0b
2020-06-15 12:09:24 -07:00
Rahul Frias
8da1145012 Add ATSC support - part 2
[ Merge of http://go/wvgerrit/100905 and http://go/ag/10708438 ]

Add support for ATSC certificate and licenses handling. ATSC
files are distinguished from the apps DRM certificate and licenses
by file naming conventions.

Bug: 139730600
Test: WV unit/integration test, GtsMediaTestCases
Change-Id: I295f66f92fe01d7716978deac9dc360d74addedd
2020-06-12 03:48:58 -07:00