widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,513 Commits 2 Branches 0 Tags
23f99c670347a4fd17ea696fa4edd5e0e7d12578
Commit Graph

6513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edwin
fbacdc687f Add unit tests for AIDL service 
[ Merged from http://go/wvgerrit/150029 ]

Test: m libwvdrmengine_hal_test -j128
Test: m libwvdrmengine_hal_test WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/libwvdrmengine_hal_test /data/nativetest/.
Test: adb shell  LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/libwvdrmengine_hal_test

Bug: 217247987
Change-Id: Ib4f22c976b8ae6c2983cb611a958ddc3a29aebdb
 2022-04-11 11:38:15 -07:00
Alex Dale
8cab20c0c5 Added OTA Keybox stress test. 
[ Merge of http://go/wvgerrit/149469 ]

Created a new test for stressing OEMCrypto's ability to generate
OTA Keybox provisioning requests.  This forces the TA to retrieve
keys from KM, generate certificate and sign the request.  This is
intended to find any unexpected system degradation within the
device's TA(s).

Bug: 227542259
Test: oemcrypto_test
Change-Id: Ib34f2f801a7fe74ca67aa0a16f68f9ae326de24e
 2022-04-04 13:44:10 -07:00
Alex Dale
81d5df3858 Merge "Added CDM support for Watermarking reporting." into tm-dev am: b3a5117b82 am: bc48ab4899 am: b7d5642a22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17364417

Change-Id: I09e5b5d904251ae0ef36220fbf5df60c2d0c77e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:49:04 +00:00
Alex Dale
b7d5642a22 Merge "Added CDM support for Watermarking reporting." into tm-dev am: b3a5117b82 am: bc48ab4899 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17364417

Change-Id: Icdad7ff12dae7d42e0c8fa46fb8acba11983f07d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:35:37 +00:00
Alex Dale
c3125d8320 Merge "Added CDM support for Watermarking reporting." into tm-dev am: b3a5117b82 am: f0de58c431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17364417

Change-Id: Ic8673e2b3ae269b71612f6bb6beed7d0e7a67579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:35:11 +00:00
Alex Dale
bc48ab4899 Merge "Added CDM support for Watermarking reporting." into tm-dev am: b3a5117b82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17364417

Change-Id: I9fdd01d9bab233e381704e4150519981410fb58e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:20:55 +00:00
Alex Dale
f0de58c431 Merge "Added CDM support for Watermarking reporting." into tm-dev am: b3a5117b82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17364417

Change-Id: I34c5ae4144472e9fa3c9f05b721dee0c58d08d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:19:58 +00:00
Alex Dale
b3a5117b82 Merge "Added CDM support for Watermarking reporting." into tm-dev 2022-04-02 01:07:07 +00:00
Alex Dale
4b8ea5e9d6 Merge "Reset UsageTableHeader when re-init for tests." into tm-dev am: b3a5a656af am: 23d6263b6a am: 575ad3d377 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17511529

Change-Id: If20c5d6339dc0cd04b5e6f9e674b448d95d2ac10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:13:05 +00:00
Alex Dale
575ad3d377 Merge "Reset UsageTableHeader when re-init for tests." into tm-dev am: b3a5a656af am: 23d6263b6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17511529

Change-Id: Iec3779c7bf50028926777ad59a35309d323f0a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 21:42:29 +00:00
Alex Dale
46ce5b68b7 Merge "Reset UsageTableHeader when re-init for tests." into tm-dev am: b3a5a656af am: 06cddd75a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17511529

Change-Id: Id08746db95b09f977f61bdab79a5e43214ebf118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 21:42:02 +00:00
Alex Dale
23d6263b6a Merge "Reset UsageTableHeader when re-init for tests." into tm-dev am: b3a5a656af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17511529

Change-Id: I15c3516dcc0ae0ee0351febd2709c0e59e588c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 21:29:17 +00:00
Alex Dale
06cddd75a3 Merge "Reset UsageTableHeader when re-init for tests." into tm-dev am: b3a5a656af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17511529

Change-Id: Ie54ef2d4d1e35164b64d3b7de505a26beaeabb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 21:28:22 +00:00
Alex Dale
97f3544866 Added CDM support for Watermarking reporting. 
[ Merge of http://go/wvgerrit/148552 ]

Extended the CDM layer to report OEMCrypto's watermarking support.
The reporting of watermarking comes in three (3) mechanisms:
1) ClientCapabilities in license requests
2) CryptoSession metrics when queried to OEMCrypto
3) String property query by apps

If OEMCrypto implementents OEMCrypto_GetWatermarkingSupport(), then
the reported watermarking support by the CDM will match that of
OEMCrypto.

If OEMCrypto does not implement OEMCrypto_GetWatermarkingSupport()
or an error occurs, it is assumed that OEMCrypto does not support
watermarking, and the CDM will report "Not Supported".

Bug: 226443788
Test: run_x86_64_tests request_license_test and license_unittest
Change-Id: Id929a356c395e6bcf45d371ee6887eec40d35329
 2022-04-01 14:24:44 -07:00
Alex Dale
b3a5a656af Merge "Reset UsageTableHeader when re-init for tests." into tm-dev 2022-04-01 21:13:32 +00:00
Alex Dale
8091ed239e Reset UsageTableHeader when re-init for tests. 
[ Merge of http://go/wvgerrit/149130 ]

When re-initializing OEMCrypto for testing purposes, the
UsageTableHeader must be reset as well.  This is to inform future
sessions to load or create a new header before creating new entries.

Bug: 219075437
Test: request_license_test and MediaDrmTests GTS
Change-Id: Ie8bc72bc7ea079d21587e114223fcb67547c756a
 2022-04-01 03:20:24 +00:00
TreeHugger Robot
2ccaa44bb5 Merge "Rename conditional flag and remove log spam." into tm-dev am: 0a65e3ba32 am: e75539ea3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17500167

Change-Id: I18988604f9c2c32cfe9eb155f793e15585ceeaf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 19:31:23 +00:00
TreeHugger Robot
b18b3e20d3 Merge "Rename conditional flag and remove log spam." into tm-dev am: 0a65e3ba32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17500167

Change-Id: I8e2943b97b5f3e8d5910ef2f00d93bfde30eebd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 19:01:51 +00:00
TreeHugger Robot
e75539ea3f Merge "Rename conditional flag and remove log spam." into tm-dev am: 0a65e3ba32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17500167

Change-Id: I40c17090aedc59028252c85ad038e5b8461b0d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 19:00:42 +00:00
TreeHugger Robot
0a65e3ba32 Merge "Rename conditional flag and remove log spam." into tm-dev 2022-03-30 18:41:32 +00:00
TreeHugger Robot
3c7e5409ac Merge "Replace _hidl_ with _hal_ in test names" into tm-dev am: 5e0c55d2f7 am: 5788057f67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17325508

Change-Id: Iaaa81672f9110e93f2b968c32d28c0ace420e554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 17:37:15 +00:00
TreeHugger Robot
ad85c2c69d Merge "Replace _hidl_ with _hal_ in test names" into tm-dev am: 5e0c55d2f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17325508

Change-Id: I130cc9d48af8e4f7ad1e7b8d392a12f66c327257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 17:20:52 +00:00
TreeHugger Robot
5788057f67 Merge "Replace _hidl_ with _hal_ in test names" into tm-dev am: 5e0c55d2f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17325508

Change-Id: I7476595bff7c3310dbb238ef70b8ad13ee61cf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 17:19:51 +00:00
TreeHugger Robot
5e0c55d2f7 Merge "Replace _hidl_ with _hal_ in test names" into tm-dev 2022-03-30 16:57:22 +00:00
Edwin Wong
2a91e85b91 Rename conditional flag and remove log spam. 
[ Merged from http://go/wvgerrit/149029 ]

Address comment in http://ag/17158449 for
b/217247987, rename BUILD_TARGET with a
unique name. Also remove $(info ...) log spam.

Test: ./build_all_unit_tests -t hidl
Test: ./build_and_run_all_unit_tests -t hidl
Test: ./build_all_unit_tests
Test: ./build_and_run_all_unit_tests
Test: ./build_and_run_all_unit_tests -t invalid (default to AIDL)
Bug: 226976702
Change-Id: I1529dfbbbd1b112668ccac22bc684817dcb9ed35
 2022-03-30 16:38:01 +00:00
Frederick Mayle
2dbe3aa3aa Merge "libwvdrmengine: Fix double ownership of WVDrmFactory" into tm-dev am: a9828a7168 am: 6e06e7637a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Change-Id: I76afa5787fcd99b0199b14505c66383cb3d7a104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 22:27:59 +00:00
Frederick Mayle
dcacd786de Merge changes from topic "presubmit-am-6622fe4b6ed34c108ae72ef4c712fd08" into tm-mainline-prod am: c64df9f755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Change-Id: I1aefd40778eca4125db4a688df66bc903a5fa3e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 22:27:27 +00:00
Frederick Mayle
6e06e7637a Merge "libwvdrmengine: Fix double ownership of WVDrmFactory" into tm-dev am: a9828a7168 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Change-Id: Ida5613c840d403fa09ca48c3649c35bc08866a9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 22:27:06 +00:00
Frederick Mayle
7e9a2f6683 Merge "libwvdrmengine: Fix double ownership of WVDrmFactory" into tm-dev am: a9828a7168 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Change-Id: I4a83853d8386a675439bf74e9cecd69606b5feca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 22:26:50 +00:00
Frederick Mayle
a9828a7168 Merge "libwvdrmengine: Fix double ownership of WVDrmFactory" into tm-dev 2022-03-28 22:13:39 +00:00
Frederick Mayle
c64df9f755 Merge changes from topic "presubmit-am-6622fe4b6ed34c108ae72ef4c712fd08" into tm-mainline-prod 
* changes:
  [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505
  libwvdrmengine: Fix double ownership of WVDrmFactory
 2022-03-28 22:13:39 +00:00
Frederick Mayle
d9c60f75d7 Merge changes from topic "presubmit-am-6622fe4b6ed34c108ae72ef4c712fd08" 
* changes:
  [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505 2p: e7ba29b5ae
  [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505
  libwvdrmengine: Fix double ownership of WVDrmFactory
 2022-03-28 22:13:39 +00:00
Suren Baghdasaryan
f48bafb7b1 Replace writepid with task_profiles command for cgroup migration 
writepid command usage to join a cgroup has been deprecated in favor
of a more flexible approach using task_profiles. This way cgroup path
is not hardcoded and cgroup changes can be easily made. Replace
writepid with task_profiles command to migrate between cgroups.

Bug: 191283136
Test: build and boot
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: If3e351ff118ea4eb395f71a7e2e0ace5b62b77c0
 2022-03-24 17:52:31 +00:00
Rahul Frias
04e403cc64 Merge "Sync license_protocol.proto" into tm-dev am: d3c653bd11 am: 7ce3d819d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17345666

Change-Id: I1d8471440b1e7459f5ce23b5f4020a6a29258ce9
 2022-03-24 04:23:46 +00:00
TreeHugger Robot
9378f74171 Merge "Correct when OEMCrypto_GetOEMPublicCertificate is called" into tm-dev am: 27d2826d03 am: 6905de19f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17365196

Change-Id: Ic9ef9f131d6ee1d7d6138294ed9a3c62e6ff0220
 2022-03-24 04:23:40 +00:00
Rahul Frias
7ce3d819d9 Merge "Sync license_protocol.proto" into tm-dev am: d3c653bd11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17345666

Change-Id: I2832e85742b9f7ef967987f848a6152e37f72630
 2022-03-24 04:23:14 +00:00
TreeHugger Robot
6905de19f9 Merge "Correct when OEMCrypto_GetOEMPublicCertificate is called" into tm-dev am: 27d2826d03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17365196

Change-Id: Ic055b39d9209f1cccee8d7fcd6ee52167986cbf2
 2022-03-24 04:17:15 +00:00
TreeHugger Robot
355e671d6e Merge "Update ExoPlayerDemo.apk" into tm-dev am: e1c107bd8f am: 202363e65d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17359730

Change-Id: Ia7d7af078ed2f9b0ae1bae23d38335c81cc0302b
 2022-03-24 04:16:51 +00:00
Alex Dale
c471a87446 Merge "Threading requirements of UsageTableHeader." into tm-dev am: cbea9a11ef am: ba0b041975 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: If439e86241ef18ccf1cb402a951390a183b6170a
 2022-03-24 04:16:15 +00:00
TreeHugger Robot
202363e65d Merge "Update ExoPlayerDemo.apk" into tm-dev am: e1c107bd8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17359730

Change-Id: If5b1756eb1ab3cd449c2e5f50cd4c6c0b395846a
 2022-03-24 04:16:09 +00:00
Alex Dale
ba0b041975 Merge "Threading requirements of UsageTableHeader." into tm-dev am: cbea9a11ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: Idd4c28c9e89e003fea89cdd3620a0d038cf3b6e6
 2022-03-24 04:12:35 +00:00
Alex Dale
36d28ecb9e Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" into tm-mainline-prod am: 5d139b2933 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: I37671e166eb2e402b29eac39ebfa1d92794cda36
 2022-03-24 04:08:12 +00:00
TreeHugger Robot
0643104d83 Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 am: 1cc217351a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17312281

Change-Id: I9cf3b825b31e1404ffc899b00d45bd2f3082c24e
 2022-03-24 04:06:49 +00:00
Alex Dale
6d09561e82 Merge "Threading requirements of UsageTableHeader." into tm-dev am: cbea9a11ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: I348c0534f30f83811dffb6d8ec72996f8c5cb7f8
 2022-03-24 04:06:10 +00:00
Rahul Frias
d3c653bd11 Merge "Sync license_protocol.proto" into tm-dev 2022-03-24 03:58:21 +00:00
TreeHugger Robot
27d2826d03 Merge "Correct when OEMCrypto_GetOEMPublicCertificate is called" into tm-dev 2022-03-24 03:52:42 +00:00
TreeHugger Robot
e1c107bd8f Merge "Update ExoPlayerDemo.apk" into tm-dev 2022-03-24 02:27:11 +00:00
Rahul Frias
c014da7da3 Correct when OEMCrypto_GetOEMPublicCertificate is called 
[ Merge of http://go/wvgerrit/148469 ]

OEMCrypto_GetOEMPublicCertificate needed to be called
before the OEM private key was loaded due to a bug in OEMCrypto.
The bug has been addressed and the call can now be removed.

OEMCrypto_GetOEMPublicCertificate is only applicable to
devices with OEM certs as their root of trust. Devices with
keyboxes (or BCC) as their RoT would return a spurious
error OEMCrypto_ERROR_NOT_IMPLEMENTED. Removing the call
addresses this as well.

Bug: 190231658
Test: WV unit/integration test
Change-Id: I8216ca5a78b8c2acb5681c7f599cdc41efdf9fc7
 2022-03-23 17:18:36 -07:00
Rahul Frias
3912635502 Sync license_protocol.proto 
[ Merge of http://go/wvgerrit/148470 ]

Bug: 226298543
Test: WV unit/integration tests
Change-Id: Id3300772182a089230e23a277775334f6731d45a
 2022-03-23 16:59:13 -07:00
Alex Dale
5d139b2933 Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" into tm-mainline-prod 
* changes:
  [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958
  Threading requirements of UsageTableHeader.
 2022-03-23 23:56:53 +00:00