TreeHugger Robot
f16e41fd3f
Merge "Revert "Zero hidl-generated structs (cas)""
2019-05-01 18:31:29 +00:00
Steven Moreland
9b2e504295
Revert "Zero hidl-generated structs (cas)"
...
This reverts commit 2b537f7852
2019-05-01 01:15:39 +00:00
Steven Moreland
e4a1aa10e6
Merge "Zero hidl-generated structs (cas)"
2019-04-30 19:27:07 +00:00
Steven Moreland
2b537f7852
Zero hidl-generated structs (cas)
...
Bug: 131356202
Test: boot
Change-Id: I41de4b8de19a060e064ff8457b81b918c4ce887f
2019-04-25 23:58:51 +00:00
Steven Moreland
6d494b2346
Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
...
am: 96f40f7b02
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f
Update hidl makefiles for bpfmt
...
hidl-generated makefiles are now generated such that bpfmt(file) == file.
Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Steven Moreland
7f4e21adda
Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
...
am: 7224bc9bcf
2019-03-04 16:05:59 -08:00
Steven Moreland
a878aee9ab
Update makefies: no 'types'
...
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
TreeHugger Robot
758ebb9aee
Merge "cas: retrieve detailed error from descrambler"
2019-01-15 20:41:05 +00:00
Chong Zhang
521f69550c
cas: retrieve detailed error from descrambler
...
Retrieve detailed error and pass back to client.
bug: 120301718
Change-Id: Iab4324c38318b7aaf73fc4072c6aeb12c3862e06
2019-01-04 12:12:25 -08:00
Peter Kalauskas
b4abef9b0a
Rename registerServiceWithCallback
...
Rename registerServiceWithCallback to registerService
Test: Build and check that cas functions as a lazy hal as before
Change-Id: Id7aac4a4b34e5891e81dcb9ead1239a37c1a70c8
2019-01-03 15:23:12 -08:00
Peter Kalauskas
d6efaf4e7c
Fix bug where lazy cas rc file ran wrong service
...
Test: Modify aosp_marlin-userdebug to use android.hardware.cas@1.0-service-lazy
and run CtsMediaTestCases
Change-Id: I4f8329b13c7a900cf4c2b14cec1017b6e40dd6c1
2018-12-14 21:31:12 +00:00
Keun Soo YIM
68ae05dd2d
pack VTS cc_test binaries as general-tests
...
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Peter Kalauskas
f646be06ed
Add separate lazy service target to cas
...
Test: Run cts test android.media.cts.MediaCasTest
Bug: 119050069
Change-Id: I5117e4d10931affe85f2a0bb437d2fefb291e18f
2018-11-28 11:56:04 -08:00
Peter Kalauskas
bf608fcc23
Convert IMediaCasService to use vintf_fragments
...
Bug: 119669996
Test: Run cts CtsMediaTestCases
Change-Id: I841c64523ce506b923a530b7fb6f2476b4607661
2018-11-20 16:49:06 -08:00
Chong Zhang
42eca4926f
cas: do not use hidl_memory if size is > SIZE_MAX
...
am: e1ce74509e
2018-05-11 14:12:51 -07:00
Chong Zhang
e1ce74509e
cas: do not use hidl_memory if size is > SIZE_MAX
...
Bug: 79376389
Test:
POC in bug; CTS MediaCasTest.
Change-Id: Ia3ecf9664ab69ce293e10b73bc20c37a9992db9f
2018-05-10 14:33:47 -07:00
TreeHugger Robot
6b6b1d2c1a
Merge "Correct type of appData field" into pi-dev
2018-04-10 04:25:29 +00:00
Chong Zhang
9c6e0dc952
Correct type of appData field
...
bug: 77732157
test: CTS MediaCasTest; VTS VtsHalCasV1_0Target.
Change-Id: I18b4e9afb52fee72d55b13a48ac1339cf4728983
2018-04-09 12:36:21 -07:00
Chong Zhang
4aabc95234
cas: fix UAF in descrambler
...
Change the plugin holder in both CasImpl and DescramblerImpl
to shared_ptr, and use atomic store/load for read/write.
bug: 73172817
Test:CTS MediaCasTest, VTS VtsHalCasV1_0Target, poc in bug
Change-Id: I3f1472d3b9d8d3dc74168c07325c5c319a96807d
2018-03-23 18:50:38 -07:00
Chong Zhang
addcb3aa51
cas: fix UAF in descrambler -- DO NOT MERGE
...
Change the plugin holder in both CasImpl and DescramblerImpl
to shared_ptr, and use atomic store/load for read/write.
bug: 73172817
Test:CTS MediaCasTest, VTS VtsHalCasV1_0Target, poc in bug
Change-Id: I6b040680c28c38cef2fef3042f570dc64e86bb77
2018-03-24 01:46:21 +00:00
Chong Zhang
d2eb83e668
MediaCas: use HidlMemory to avoid handle leaks
...
bug: 67710751
test: VTS VtsHalCasV1_0Target test
Change-Id: Ia9a3c38b755a1aeb1d16dba30217055e6f0c27e2
2018-02-15 15:45:35 -08:00
Zhuoyao Zhang
a964d83a1f
Merge "Convert cas hal test to use VtsHalHidlTargetTestEnvBase" am: fadafee26a am: 16465a4b37
...
am: 707258b232
2018-02-09 20:42:12 +00:00
Zhuoyao Zhang
707258b232
Merge "Convert cas hal test to use VtsHalHidlTargetTestEnvBase" am: fadafee26a
...
am: 16465a4b37
2018-02-09 20:34:39 +00:00
Zhuoyao Zhang
a5e6707e9c
Convert cas hal test to use VtsHalHidlTargetTestEnvBase
...
Bug: 64203181
Test: make vts
vts-tradefed run vts -m VtsHalCasV1_0Target
Change-Id: If8174499b0fce2404fa3f363bc3ec439092c4068
2018-02-08 21:31:01 -08:00
Steven Moreland
905ca6a633
Merge "Remove conditional vndbinder usage in CAS." am: 231626d43d
...
am: 897864234e
2017-12-15 20:20:10 +00:00
TreeHugger Robot
58983cb2b2
Merge "cas: manually clear strong ref before callback"
2017-12-14 08:46:11 +00:00
TreeHugger Robot
6658796be0
Merge "Reland "Remove conditional vndbinder usage in CAS.""
2017-12-14 04:01:11 +00:00
Steven Moreland
11a8a0e183
Reland "Remove conditional vndbinder usage in CAS."
...
Fugu kernels have been updated.
Bug: 70393284
Test: fugu boots
This reverts commit e9fb979b1e
2017-12-13 21:35:44 +00:00
Chong Zhang
ea3f07b614
cas: manually clear strong ref before callback
...
Hidl doesn't guarantee the server side method goes out of scope
before the client side returns. Even when client calls on the
same thread, the next method could overlap the previous call.
Next call can come in as soon as the hidl callback is called.
In case of openSession and release, there is a rare chance that
release call comes in before previous openSession is returned.
If this happens, the cas plugin object destructor is delayed to
the point when openSession goes out of scope (thus let go its
strong ref to the plugin). This violates our contract that the
plugin object and all associated sessions are released by the
time release() returns.
Manually clean up the strong ref before calling hidl callback
in openSession would fix this.
bug: 70544685
Change-Id: Id89a00591a354c8a46def3cc691dd8e28b4c971b
2017-12-12 22:09:20 -08:00
Steven Moreland
e9fb979b1e
Revert "Remove conditional vndbinder usage in CAS."
...
This reverts commit 5884a6f0f3
2017-12-08 19:34:26 +00:00
Steven Moreland
75673fc6ac
Remove conditional vndbinder usage in CAS.
...
Platform consistency, removing overload of meaning
behind PRODUCT_FULL_TREBLE/treble variable.
Bug: 67975337
Test: boot
Change-Id: I09df37fc0306f80879424334029ab9668cee9d4f
Merged-In: I09df37fc0306f80879424334029ab9668cee9d4f
2017-12-06 16:12:41 -08:00
Steven Moreland
4e1e4081e4
Updating makefiles for hidl_interface.
...
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
(cherry-picked from commit c2f829a1d2
2017-12-03 10:31:49 -08:00
Steven Moreland
5884a6f0f3
Remove conditional vndbinder usage in CAS.
...
Platform consistency, removing overload of meaning
behind PRODUCT_FULL_TREBLE/treble variable.
Bug: 67975337
Test: boot
Change-Id: I09df37fc0306f80879424334029ab9668cee9d4f
2017-11-29 12:51:31 -08:00
Chong Zhang
95cc5af781
cas: add vts test to catch oob in descrambling requests
...
bug: 67962232
test:
cts MediaCasTest
vts VtsHalCasV1_0Target
Change-Id: I825e8cefb0d6f8e183e96ee2ebfbe0be1572dca8
2017-11-21 10:54:40 -08:00
Steven Moreland
c2f829a1d2
Updating makefiles for hidl_interface.
...
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 11:39:07 -08:00
Steven Moreland
8db261bc99
Updating makefiles for hidl_interface.
...
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 10:00:18 -08:00
Chong Zhang
5e17666308
Merge "cas: validate shared buffer size before using" into oc-mr1-dev am: 6a8fab9781
...
am: 66905b8168
2017-11-10 09:08:05 +00:00
Chong Zhang
16a3cd0b07
cas: validate shared buffer size before using
...
bug: 67962232
test:
cts MediaCasTest
vts VtsHalCasV1_0Target
Change-Id: I20b89d5971db4c89704245bb00c281af8c943697
2017-10-31 11:53:39 -07:00
TreeHugger Robot
f3d37254df
Merge "Update for Soong-only makefiles."
2017-10-11 20:00:03 +00:00
Suresh Sivaraman
ab4c6f8fde
Merge "Added VTS tests for requiresSecureDecoderComponent and release API" into oc-mr1-dev am: 2528c405f3
...
am: 7c932db240
2017-10-11 18:42:14 +00:00
TreeHugger Robot
2528c405f3
Merge "Added VTS tests for requiresSecureDecoderComponent and release API" into oc-mr1-dev
2017-10-11 18:33:25 +00:00
Steven Moreland
f390f03aa4
Update for Soong-only makefiles.
...
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
2017-10-11 18:30:28 +00:00
Chong Zhang
542be2bcdf
Merge "cas-vts: use MemoryDealer to allocate shared memory" into oc-mr1-dev am: de05222287
...
am: 6643820a0d
2017-10-11 01:21:35 +00:00
Chong Zhang
704d5861a7
cas-vts: use MemoryDealer to allocate shared memory
...
cas hal can't (and doesn't need to) use hidl_memory allocated by
hidl allocator. All real clients (MediaDescrambler jni, ACodec)
are using MemoryDealer-allocated ashmem only. Modify the test
to cover these cases.
bug: 67603039
test:
> make vts -j64
> vts-tradefed run vts -m VtsHalCasV1_0Target
Change-Id: Ib9563abc1a14c34781a28d15c7766c6c160d288a
2017-10-10 13:09:32 -07:00
Suresh Sivaraman
6d176aa77d
Added VTS tests for requiresSecureDecoderComponent and release API
...
Bug: 63914034
Bug: 65593293
Test:
Build & test vts:
> make vts -j64
> vts-tradefed run vts -m VtsHalCasV1_0Target
Change-Id: I465735768239f2d53427a18e5ad1fa0069f6e35c
2017-10-09 12:38:13 -07:00
Suresh Sivaraman
1ce1e21517
Merge "Added VTS tests for MediaCas - II" into oc-mr1-dev am: 239a450438
...
am: 4833ea292c
2017-10-06 16:57:06 +00:00
Suresh Sivaraman
0645aec1de
Added VTS tests for MediaCas - II
...
Bug: 63914034
Bug: 65593293
Test:
Build & test vts:
> make vts -j64
> vts-tradefed run vts -m VtsHalCasV1_0Target
Change-Id: If5a0e7cb3d520843ba45147a085c43b94027e584
2017-10-05 19:47:31 +00:00
Steven Moreland
3788a7321f
Update makefiles for hidl-adapter (2/2).
...
Bug: 37518178
Test: none
Change-Id: I77fe67964f89da8b66aeb8df6d424de0f8689f8d
2017-09-27 08:55:47 -07:00
Suresh Sivaraman
9bd69497f8
Merge "Added VTS tests for MediaCas" into oc-mr1-dev am: 6b3d1649bc
...
am: 71a9489ae1
2017-09-21 23:36:57 +00:00
