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

6392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Dale
cbea9a11ef Merge "Threading requirements of UsageTableHeader." into tm-dev 2022-03-23 23:56:53 +00:00
Alex Dale
5ba7ab4d25 Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" 
* changes:
  [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 2p: 6bff1691c5
  [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958
  Threading requirements of UsageTableHeader.
 2022-03-23 23:56:53 +00:00
TreeHugger Robot
1cc217351a Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17312281

Change-Id: Ie9861efbea099c18bd7ca0d7b2ce10cc8fcdd36f
 2022-03-23 23:33:08 +00:00
TreeHugger Robot
7cab9e5031 Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17312281

Change-Id: I5aca4c1df46e7fd61d2c22d1b46dd25684d40d57
 2022-03-23 23:32:51 +00:00
TreeHugger Robot
26ee600923 Merge "Copied OEMCrypto utils to Android." into tm-dev 2022-03-23 23:16:15 +00:00
Kyle Alexander
b705d68631 Update ExoPlayerDemo.apk 
Test: Playback of content in ExoPlayerDemo.apk

Bug: 203837661
Change-Id: Ic62b483b92215d2369b05bc2adc33d754ef5de5e
 2022-03-23 15:29:57 -07:00
Presubmit Automerger Backend
691a355fbe [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 2p: 6bff1691c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Bug: 189366337
Change-Id: I7d3867d8b1cbfcd6d65cb113b9f7d513fdcb9498
 2022-03-23 18:54:33 +00:00
Presubmit Automerger Backend
6bff1691c5 [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Bug: 189366337
Change-Id: I608978a6acd8b5166cb6f7101134a7319570c941
 2022-03-23 18:54:27 +00:00
Alex Dale
64047c8958 Threading requirements of UsageTableHeader. 
[ Merge of http://go/wvgerrit/148450 ]

This CL adds threading requirements to the method doc-comments of
UsageTableHeader.

Bug: 189366337
Test: usage_table_header_unittest
Change-Id: I671f702d3e8ec219cc8daaa220133cb8cec183c8
 2022-03-23 11:54:12 -07:00
Frederick Mayle
a415b078ea [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505 2p: e7ba29b5ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Bug: 226379467
Change-Id: Ib09f225b85dfeea9d3aed5af754a2b5840856843
 2022-03-23 18:00:14 +00:00
Frederick Mayle
e7ba29b5ae [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Bug: 226379467
Change-Id: I107699d2e563a7fd32ad31584316bddaa43f5aa0
 2022-03-23 18:00:08 +00:00
Frederick Mayle
3112fd5505 libwvdrmengine: Fix double ownership of WVDrmFactory 
Using std::make_shared with ndk::SharedRefBase objects causes memory
errors.

Bug: 226379467
Test: TH
Change-Id: I3649ace96067e68cfc0ac998c836d9a8bd48bd11
 2022-03-23 18:00:00 +00:00
Edwin Wong
0f3c297250 Replace _hidl_ with _hal_ in test names 
[ Merged from http://go/wvgerrit/148451 ]

This step is a prelude in adding Widevine unit tests that
use AIDL interface.

Test: ./build_and_run_all_unit_tests.sh
Bug: 217247987
Change-Id: I449050819e6c9b0261066997dd45a6103b3a9a7a
 2022-03-23 07:16:27 -07:00
TreeHugger Robot
f3024f2a93 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de am: 5867bbec85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17158450

Change-Id: I19bdaf8d9024df29f456de9e1f70fad4eda594bc
 2022-03-22 23:57:57 +00:00
TreeHugger Robot
5867bbec85 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17158450

Change-Id: I150e16d671e31a137056a5384411aba04533f2f0
 2022-03-22 23:33:34 +00:00
TreeHugger Robot
8b4efe6eb9 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17158450

Change-Id: I60cba93678ff43c69c4d0c29908ae598a99f84c1
 2022-03-22 23:33:21 +00:00
Rahul Frias
c58cc6d5e4 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 am: 534dad1777 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17300766

Change-Id: I89efbb23cf0e37cc17ce55398cf77a827376f23f
 2022-03-22 23:27:29 +00:00
TreeHugger Robot
dddd1142de Merge "Enable Widevine Aidl service." into tm-dev 2022-03-22 23:17:15 +00:00
Rahul Frias
09db0f4f27 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17300766

Change-Id: Idef2f4b8dfb60bead7bdaa8f370b2ebf853e045c
 2022-03-22 23:06:57 +00:00
Rahul Frias
534dad1777 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17300766

Change-Id: Ia075ddd8cb66652aa97b3594144d4213b5407d67
 2022-03-22 23:06:08 +00:00
Rahul Frias
d210233e58 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev 
* changes:
  Return error first if the returned status is not ok
  Constrain the generated key type in testing
  Free EC key in test session destructor
 2022-03-22 21:51:32 +00:00