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

4791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-team Robot
f16ff81bda Snap for 7166462 from 2f10256f50 to tm-release 
Change-Id: Id28dd4ab5be0e363c6adbe36c4a8296b64415154
 2021-02-24 04:18:43 +00:00
Alex Dale
2f10256f50 Merge "Include DRM key type to SessionMetrics." 2021-02-23 23:25:51 +00:00
Edwin Wong
52019cfbc4 Merge "Display menu if no argument is given." into sc-dev am: 8659675556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13669989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33806b889e616fe034b811d208b738d051aa76cf
 2021-02-23 21:51:51 +00:00
Edwin Wong
8659675556 Merge "Display menu if no argument is given." into sc-dev 2021-02-23 21:03:08 +00:00
Alex Dale
84c17d0171 [automerger skipped] Merge changes I09249afe,I713ff1c4 into sc-dev am: a1d66834de -s ours 
am skip reason: Change-Id I09249afe9c291632fb651ecd00eac697d6939ec7 with SHA-1 247cf053e5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13619230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4abbfcd9c495db85e35391ee9f502ea68f4e350c
 2021-02-23 07:23:27 +00:00
Alex Dale
838c06922f [automerger skipped] Merge "Updated DrmDeviceCertificate for signature algo." into sc-dev am: 19e1008df7 -s ours 
am skip reason: Change-Id I164a1c9266fb74b6cdd0ff35f1986ca032033bba with SHA-1 667c672c80 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13619228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf7c928e8448407fb27d3d472f4579391f3d72d8
 2021-02-23 07:22:25 +00:00
Edwin Wong
0ac0ee50eb Display menu if no argument is given. 
If not argument is given, the app just sits and wait
for stdin input, this can be confusing for the user.
Add logic to display menu if no argument is given.

Test: metrics_dump
  display menu

Test: metrics_dump [bugreport from sabrina-q.gz]
  display mediadrm and widevine metrics

Test: metrics_dump --mediadrm [adb shell dumpsys media.metrics output]
  display mediadrm metrics

Test: metrics_dump --widevine [adb shell dumpsys media.metrics output]
  display widevine metrics

Test: metrics_dump [bugreport from sabrina-q.gz] --widevine
  display menu because the order is app_name, options, input file

Bug: 180983850
Change-Id: I9b35f782d8f59663661148d3950f89e4724b6bce
Merged-In: I9b35f782d8f59663661148d3950f89e4724b6bce
 2021-02-22 23:04:59 -08:00
Alex Dale
a1d66834de Merge changes I09249afe,I713ff1c4 into sc-dev 
* changes:
  Enable the CDM to track the DRM private key type.
  Report OEMCrypto's ECC capabilities.
 2021-02-23 06:53:31 +00:00
Alex Dale
19e1008df7 Merge "Updated DrmDeviceCertificate for signature algo." into sc-dev 2021-02-23 06:53:18 +00:00
android-build-team Robot
cda8bd5ced Snap for 7163758 from 82b5bc00cb to tm-release 
Change-Id: Ie97e18b1758f52289e79a7008aa30f7fdf4d9f0a
 2021-02-23 04:17:29 +00:00
Robert Shih
82b5bc00cb Merge "OEMCrypto_LoadLicense doc cleanup" into sc-dev am: ae9b1cd128 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13639625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c41c6e2e3e7f86c1446676cd7e4e79679791da5
 2021-02-23 00:18:26 +00:00
Robert Shih
1c9c26af01 wvhidl: map wvcdm LogPriority to hidl LogPriority am: f7285fb0e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13580488

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdc6695f78522ca045b6e779138114a1968876fd
 2021-02-23 00:18:21 +00:00
Robert Shih
ae9b1cd128 Merge "OEMCrypto_LoadLicense doc cleanup" into sc-dev 2021-02-22 23:30:55 +00:00
Robert Shih
00b4a9b5b5 OEMCrypto_LoadLicense doc cleanup 
Bug: 162255728
Change-Id: I11f74b1f38e0e073e0e2e464bdce41e720f00549
 2021-02-20 08:38:39 +00:00
Robert Shih
f7285fb0e9 wvhidl: map wvcdm LogPriority to hidl LogPriority 
[Merge of http://go/wvgerrit/117343]

Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: I368b2d7a125e62e46ded322c1e171a15a9a7a1b4
 2021-02-19 01:53:22 -08:00
android-build-team Robot
401a9bdb38 Snap for 7155439 from 027b61caa3 to tm-release 
Change-Id: Ib3dc70b81aaadc0acd2164c988574ce99bccd581
 2021-02-19 04:17:36 +00:00
Alex Dale
e15c0607c7 Enable the CDM to track the DRM private key type. 
[ Merge of http://go/wvgerrit/110923 ]

The CDM is responsible for telling OEMCrypto the underlying DRM
private key type when loading it into a session.  To do this, the
CDM must determine and store the key type of a successfully loaded
provisioning response.  The type of key is available from the
DRM certificate proto that is provided in the reponse.

This change introduces a class to contain the wrapped key and
type together.  To store the type, the CDM device files have been
updated to include a key type with the DRM certificate and to
store from and load to the new class.

Unittests have been updated for using the new class where the
wrapped key was used before.

Test: Linux unit tests
Bug: 140813486
Change-Id: I09249afe9c291632fb651ecd00eac697d6939ec7
(cherry picked from commit 6c457402e944079271cef488aa4699f986da6a2e)
Merged-In: I09249afe9c291632fb651ecd00eac697d6939ec7
 2021-02-18 23:10:39 +00:00
Alex Dale
e70c7a116e Report OEMCrypto's ECC capabilities. 
[ Merge of http://go/wvgerrit/110824 ]

When generating a provisioning request, the CDM includes the different
certificate key types that are supported.

This change will enable the reporting of ECC certificate types if
OEMCrypto supports them.

Test: Linux unit tests and Android integration test
Bug: 140813486
Change-Id: I713ff1c469dff5c8a41461727ce63486d962575e
(cherry picked from commit 547d2f8775)
Merged-In: I713ff1c469dff5c8a41461727ce63486d962575e
 2021-02-18 23:09:53 +00:00
Alex Dale
5e982e8fff Updated DrmDeviceCertificate for signature algo. 
[ Merge of http://go/wvgerrit/110823 ]

DrmDeviceCertificate is the CDM's reduced version of DrmCertificate
used in the backend.  With the introduction of ECC, the CDM needs to
extract the signature algorithm to determine how to handle the wrapped
private key used by OEMCrypto post-provisioning.

This change brings the DrmDeviceCertificate in line with the
provisioning service's DrmCertificate message as the new source of
truth.

Bug: 140813486
Test: Compiled proto
Change-Id: I164a1c9266fb74b6cdd0ff35f1986ca032033bba
(cherry picked from commit 667c672c80)
Merged-In: I164a1c9266fb74b6cdd0ff35f1986ca032033bba
 2021-02-18 23:08:29 +00:00
android-build-team Robot
4ed5f57c27 Snap for 7151881 from c3c84ea380 to tm-release 
Change-Id: I2df6bf3c092d1e7beeb984c47428ee16dcdd50e2
 2021-02-18 04:17:54 +00:00
Robert Shih
027b61caa3 Merge "wv hidl: map CdmResponseType to drm@1.4 Status" into sc-dev am: 9397f5b972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13526141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebef20947e294aa7bfecf6582607a410b053ca44
 2021-02-18 00:48:21 +00:00
Robert Shih
6936b1efee WVDrmPlugin: map OEMCryptoResult to drm@1.4 Status am: 0450bfcda1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13593533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d37e77799ea2075df1dc4811304921c587e8974
 2021-02-18 00:47:48 +00:00
Robert Shih
9397f5b972 Merge "wv hidl: map CdmResponseType to drm@1.4 Status" into sc-dev 2021-02-18 00:25:48 +00:00
Robert Shih
c3c84ea380 Merge "Run git-clang-format on log.{h,cpp}" into sc-dev am: bbfa2b4ff4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13580486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a9559765e84ea8c561803ab37223c2bd1577cf5
 2021-02-17 09:38:53 +00:00
Robert Shih
0450bfcda1 WVDrmPlugin: map OEMCryptoResult to drm@1.4 Status 
Bug: 162255728
Change-Id: Ieb7de4e3d40e132ab17d5907132879714ef7e918
Test: MediaDrmTest#testExceptionMessage
 2021-02-17 09:05:21 +00:00
Robert Shih
bbfa2b4ff4 Merge "Run git-clang-format on log.{h,cpp}" into sc-dev 2021-02-17 09:01:14 +00:00
android-build-team Robot
036fe2c4c5 Snap for 7150039 from d754094d27 to tm-release 
Change-Id: I7de49e8e07d1ae341feefaf2bdb577acfbe31956
 2021-02-17 04:16:57 +00:00
Alex Dale
47fc031576 Include DRM key type to SessionMetrics. 
[ Merge of http://go/wvgerrit/111903 ]

CDM metrics has been updated to include the DRM key type.  The CDM
session records the key type when the wrapped DRM key is successfully
loaded into an OEMCrypto session.

Now that the API refers to a general DRM key rather than an RSA key,
the timer metric for loading the DRM key has been renamed on the client
to reflect this.

Test: Metric unit tests
Bug: 140813486
Change-Id: I9069f13ac7c979cc8556e08591e1cf8f623d0a84
 2021-02-16 10:30:30 -08:00
Robert Shih
89b9cb2706 Run git-clang-format on log.{h,cpp} 
Bug: 168341163
Test: build
Change-Id: Ie51b1d4ab66e256992b6fffa524331ec124e047d
 2021-02-16 00:39:43 -08:00
Robert Shih
d754094d27 Run git-clang-format am: fa49fdade0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13549770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e61f1c9d701212a7ad5093790dfc648ebc22aa5
 2021-02-16 08:17:08 +00:00
Robert Shih
fa49fdade0 Run git-clang-format 
Bug: 168341163
Test: build
Change-Id: Icf8bd644ee5e87cd499ee017c8c522a96d385d4c
 2021-02-11 08:40:31 -08:00
android-build-team Robot
c5afa031f4 Snap for 7133387 from 0a68fbf9d7 to tm-release 
Change-Id: If98a363a261a558c30e2c6a8b7d06fa39625ab45
 2021-02-09 04:17:31 +00:00
Robert Shih
6ed2c30a0a wv hidl: map CdmResponseType to drm@1.4 Status 
Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: Icc96c17f38218475efc7489348b75c9978f16b01
 2021-02-08 19:10:43 -08:00
Alex Dale
0a68fbf9d7 Merge "Enable the CDM to track the DRM private key type." 2021-02-08 23:23:20 +00:00
android-build-team Robot
a562dfecd1 Snap for 7128347 from 37991d8ee2 to tm-release 
Change-Id: I888f2ebda0134a4ba94f29b0e23e299cff1836c6
 2021-02-06 04:17:31 +00:00
Robert Shih
37991d8ee2 Merge "libwvhidl: implement API to get plugin logs" into sc-dev am: e77b029214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13473325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18037e6f04ad5df060c2dbcf9a8dab379acb3634
 2021-02-05 06:15:50 +00:00
Robert Shih
e77b029214 Merge "libwvhidl: implement API to get plugin logs" into sc-dev 2021-02-05 05:28:00 +00:00
android-build-team Robot
e72a926fe1 Snap for 7125416 from 044b7684d5 to tm-release 
Change-Id: Iee50d59ada4f462ce3cad452c77ea0e125b936f4
 2021-02-05 04:17:11 +00:00
Edwin Wong
044b7684d5 Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 37e0991645 am: 3ee1f400e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ec7a77f80c37409a1b3bde1b4a866c88eda095
 2021-02-04 18:29:47 +00:00
Robert Shih
e04cb8dac2 Save recent Widevine CDM logs am: 83ef9081d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13472557

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d46fa52ea2552df7f40ec634b4f82f438e70d94
 2021-02-04 18:29:23 +00:00
Edwin Wong
3ee1f400e7 Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 37e0991645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71106d21ee571a1446ffe9271e8c1f5672505abf
 2021-02-04 18:25:22 +00:00
Robert Shih
12995287fa libwvhidl: implement API to get plugin logs 
Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: I333cb1ee2f25ae718e7f544f4a5f7ee50668041a
 2021-02-04 06:43:54 -08:00
Robert Shih
83ef9081d1 Save recent Widevine CDM logs 
Bug: 162255728
Test: cdm unit tests
Change-Id: Ibc0daf374bedd8ac2a9a0515835e2775045962a7
 2021-02-04 05:12:09 +00:00
android-build-team Robot
0125ad75b9 Snap for 7122589 from 041157e3f0 to tm-release 
Change-Id: I045cf38980dcb66d566a3a2dd9a3f9e26496182f
 2021-02-04 04:17:37 +00:00
TreeHugger Robot
041157e3f0 Merge "Shell quoting in move_widevine_data.sh" 2021-02-03 05:29:45 +00:00
android-build-team Robot
e9692555d1 Snap for 7120117 from 5ac6a8ff3d to tm-release 
Change-Id: Ia1a1df6704abf32d3696fd67479ff33bf929155f
 2021-02-03 04:11:57 +00:00
Edwin Wong
5ac6a8ff3d Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 0126cc541f am: cd37425acb am: 2b094e710e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a0954e9047c777f924622d1f32cc1b01b1cb127
 2021-02-03 02:53:50 +00:00
Edwin Wong
2b094e710e Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 0126cc541f am: cd37425acb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0171ddb362a84d8b08c9a429e40adab4baf1b8c
 2021-02-03 02:19:51 +00:00
Edwin Wong
fc806387f0 Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 37e0991645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5171e6e3c74b379e759526fe6610e89bac62aacd
 2021-02-03 01:34:34 +00:00
Edwin Wong
cd37425acb Fix potential decrypt src pointer overflow. am: c3a24e6c86 am: 25f89c373c am: 15ba854123 am: 0126cc541f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13421305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1644e541f8f21e85f58b600880537da9bd7d9301
 2021-02-03 01:33:24 +00:00