Commit graph

157 commits

Author SHA1 Message Date
Treehugger Robot
0ff72a9189 Merge "CAS AIDL: Start thread pool for default service" into main 2023-11-10 04:14:03 +00:00
Venkatarama Avadhani
a6710298c8 CAS AIDL: Start thread pool for default service
Add missing call to start the thread pool for the default CAS AIDL
service.

Bug: 301369982
Test: atest android.media.misc.cts.MediaCasTest#testClearKeyApis
Change-Id: I6c0572f8573627a817ac5a429bd6800a95687380
2023-11-07 20:51:37 +05:30
Pawan Wagh
19c9d5b607 Remove vendor from android.hardware.cas-service_fuzzer
Fuzzer fails to get defaultServiceManager due to hermiticity issues
when vendor is enabled in cc_fuzz which uses vendor variant of
libbinder under libbinder_ndk.

Test: m android.hardware.cas-service_fuzzer && adb sync data && adb
shell
/data/fuzz/x86_64/android.hardware.cas-service_fuzzer/android.hardware.cas-service_fuzzer
-runs=10000
Bug: 301768467

Change-Id: Ief27f75f4330973fc194c77ea36cdbb826f35807
2023-10-26 23:32:23 +00:00
Jooyung Han
9e73b2047a Use explicit requirements from APEX
Previously, CAS APEX used ":sphal" and `android_load_sphal_library` to
open plugins from /vendor/lib/mediacas. It was a workaround because
there's no way to limit the scope to /vendor/lib/mediacas. And CAS
plugins are not SPHAL libraries.

Now, the APEX uses more explicit requirements: ":mediacas", which
limitss the scope to /vendor/lib/mediacas.

Bug: 298542407
Test: atest CtsMediaMiscTestCases:MediaCasTest
Change-Id: Id91a87e0f6ef8a761e37cabed7da8b9fed0591c2
2023-10-12 16:37:03 +09:00
Jooyung Han
a4f82631a2 Merge "Revert^2 "Add CAS HAL APEX"" into main am: d67ffc4b89
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2752545

Change-Id: I786dad36c8e68a3e9c8dec87f1ebd2ed4511d44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:50:45 +00:00
Jooyung Han
5a3d588442 Revert^2 "Add CAS HAL APEX"
8b19286ce3

This relands the CAS HAL APEX.

Bug: 297467514
Test: atest CtsMediaMiscTestCases:MediaCasTest
Change-Id: I741d059688ac65f42bed45e068cd00ccc5d631f5
2023-09-15 00:17:30 +09:00
Sebastian Pickl
60423940fb Merge "Revert "Add CAS HAL APEX"" into main am: 38a85e778c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751047

Change-Id: I7d58fe5d762e6def2fc2d2000e7dc18cb8ef582c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 12:37:00 +00:00
Sebastian Pickl
38a85e778c Merge "Revert "Add CAS HAL APEX"" into main 2023-09-14 12:26:38 +00:00
Sebastian Pickl
8b19286ce3 Revert "Add CAS HAL APEX"
Revert submission 2742398-cas-apex

Reason for revert: culprit for flake b/300311777, verified with go/abtd with 15 runs to make sure the flake is gone https://android-build.googleplex.com/builds/abtd/run/L46500000963034919

Bug:300311777

Reverted changes: /q/submissionid:2742398-cas-apex

Change-Id: Ia13d761d7df501fb30170a69462427198bcf924d
2023-09-14 12:25:33 +00:00
Tomasz Wasilczyk
903a322bbe Merge "Don't depend on String8 cast to C string [cas]" into main am: 610889508f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748299

Change-Id: Ief959f2b38ac3aa2a8ecc98cbe1c98f2b2342b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 16:21:20 +00:00
Tomasz Wasilczyk
11a55db7c9 Don't depend on String8 cast to C string [cas]
Bug: 295394788
Test: m checkbuild
Change-Id: I82c94f0a720957c443f92b030214c6d2c47bf009
2023-09-13 04:24:54 +00:00
Jooyung Han
7e47136062 Merge "Add CAS HAL APEX" into main am: d26b6cf395
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2742399

Change-Id: Id15f7cb227260b72930fac201fae6c5198ac80e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:20:22 +00:00
Jooyung Han
d26b6cf395 Merge "Add CAS HAL APEX" into main 2023-09-13 00:51:34 +00:00
Treehugger Robot
8a835a8e97 Merge "Merge OWNERS files for cas" into main am: a1a873d44b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746250

Change-Id: Ie0a4a8cc6a2f21ac92a1e18a41bbd6fec1e91f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 23:47:33 +00:00
Treehugger Robot
a1a873d44b Merge "Merge OWNERS files for cas" into main 2023-09-08 22:55:43 +00:00
Devin Moore
064fc8cb99 Merge OWNERS files for cas
Test: none
Bug: 296950573
Change-Id: Id64ddb114d520591ab443d4d226e87212c82dd6f
2023-09-08 20:35:10 +00:00
Treehugger Robot
c4e9e8e72e Merge "Migrate from android::String isEmpty to empty" into main am: 594656ed52
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2745913

Change-Id: I833094249fc07e65dbbace20c78373ea8c5fa51d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 18:04:54 +00:00
Tomasz Wasilczyk
ad5787ada5 Migrate from android::String isEmpty to empty
Bug: 295394788
Test: make checkbuild
Change-Id: I66604d41926df012fd5834e74818f3179b77eb02
2023-09-07 15:51:14 +00:00
Jooyung Han
4fb30ff596 Add CAS HAL APEX
The new apex replaces android.hardware.cas-service.example.

Bug: 297467514
Test: atest CtsMediaMiscTestCases:MediaCasTest
Change-Id: I802ab0fe8ffbefd6c1ff9343f6046701fa94029f
2023-09-06 17:18:01 +09:00
Tomasz Wasilczyk
1efd25417d Merge "Don't use String8 path functions [cas hidl]" into main am: 750f415a8d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2731253

Change-Id: Iae93f503b5efefe618508105630484cae3e9e937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 10:26:36 +00:00
Tomasz Wasilczyk
58b5bae48c Merge "Use String8/16 c_str [cas]" into main am: f23e19a533
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2705833

Change-Id: I1b8dc5d5ae6e2c3b1f11afabc46ad7bb167935fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 10:26:04 +00:00
Tomasz Wasilczyk
750f415a8d Merge "Don't use String8 path functions [cas hidl]" into main 2023-08-30 04:29:48 +00:00
Tomasz Wasilczyk
f23e19a533 Merge "Use String8/16 c_str [cas]" into main 2023-08-30 04:29:16 +00:00
Tomasz Wasilczyk
2a3bd01693 Move OWNERS from cas AIDL HAL to general cas folder am: 3eb3155155
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727998

Change-Id: I2c2081420c4a1f5bc790dec439e863620a697149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 22:38:51 +00:00
Tomasz Wasilczyk
3eb3155155 Move OWNERS from cas AIDL HAL to general cas folder
Test: N/A
Change-Id: I1fe535e1468e4dd238f238144dc4795d0089fd7c
2023-08-29 22:04:35 +00:00
Tomasz Wasilczyk
9e53281dc0 Don't use String8 path functions [cas hidl]
Ideally, we should migrate to std::filesystem, but libc++fs is not
available for vendor binaries until b/175635923 lands.

Bug: 295394788
Test: m checkbuild
Change-Id: Ifaec2f93331c780b96f7be5d50655a79aa935457
2023-08-29 15:04:50 +00:00
Xin Li
ba758129d3 Merge changes from topic "udc-merge-291102124" into aosp-main-future
* changes:
  Clean up android.hardware.automotive.vehicle intermediates.
  Merge Android U (ab/10368041)
2023-08-28 22:13:07 +00:00
Treehugger Robot
24c2867516 Merge "Don't use String8 path functions" into main 2023-08-25 22:44:37 +00:00
Xin Li
879960bdce Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I7b6fffac2ada0e039f79bad8cc9b4d954e9c3460
Change-Id: I9466127d8d0fa38df36ca99f704853b2db871e67
2023-08-25 13:29:30 -07:00
Tomasz Wasilczyk
3e74f0b928 Use String8/16 c_str [cas]
Bug: 295394788
Test: make checkbuild
Change-Id: I1faccac8711d5cccee70443548940d99804c7c2a
2023-08-25 19:41:37 +00:00
Tomasz Wasilczyk
38836b884b Migrate from android::String isEmpty to empty
This empty method is different from the old one - it aligns with
std::string definition.

Bug: 295394788
Test: make checkbuild
Change-Id: I98dad222b149e6052b7dc63c477d84c9eb011dd3
2023-08-24 18:49:22 +00:00
Tomasz Wasilczyk
7c52bb1e7f Don't use String8 path functions
Ideally, we should migrate to std::filesystem, but libc++fs is not
available for vendor binaries until b/175635923 lands.

Bug: 295394788
Test: m checkbuild
Change-Id: If285034d7b343531082d0176ab26bf51390714d0
2023-08-23 15:10:11 +00:00
Venkatarama Avadhani
90e664dfa6 CAS: Add SYS_NICE Capability
Add SYS_NICE capability to the CAS services. This will enable the
service to set its priority.

Bug: 286011513
Test: Build
Change-Id: I5cd58a3a9db53fcc004557a8e9f509ebd6291c2d
2023-08-08 15:35:08 +05:30
Garfield Tan
a68b2696e8 Let the lazy CAS HAL to override the regular one
Some devices may choose to use the lazy version of CAS HAL than the
regular one, but the default one is added to pretty much all devices in
the commit 4f5534b0d381a0968e81ee20e81b791aebe5493d in the
platform/build project. Adding the lazy version will duplicate the
implementation of CAS HAL.

This is what is done in the 1.2 HIDL implementation.

Bug: 291344726
Test: Only the lazy implementation is installed to devices that require
the lazy version.

Change-Id: I88ee8d2fa4c27720817e65e5c41ffc74d6b2d61f
2023-07-17 14:58:48 -07:00
Garfield Tan
7777a4be12 Unmark executable bits from CAS AIDL HAL impl
None of these files are executable. The .rc and .xml files shouldn't be
installed to the device image as executables either.

Bug: None
Test: Files installed on the device aren't executables anymore.
Change-Id: Id15ecc7febb56ea108155fcbd338efeb8885709a
2023-07-17 14:58:47 -07:00
Alex Buynytskyy
ec1198d941 UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-04-07 23:41:20 +00:00
Henry Fang
678e42f76b Change for HAL's committee's feedback from http://ag/21528528
Change-Id: Id0db0e05ed812a783f0377412ba91997ce22b08a
bug: 239228238
2023-03-04 02:03:33 +00:00
Venkatarama Avadhani
a4d80bdf3e CAS: Move OWNERS file from default to base folder am: 3e2719e85c am: ebfd4097a7 am: 5ccdfa5aae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2424805

Change-Id: I4ecb73ab1eec0d41332f05f00fa74486526af4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 21:36:01 +00:00
Venkatarama Avadhani
3e2719e85c CAS: Move OWNERS file from default to base folder
Bug: None
Test: None
Change-Id: I1d59460821ab23ba20fb88dc4072bb3a0bf055b4
2023-02-07 19:31:26 +00:00
Yixiao Luo
88fe0d5d68 Merge changes from topic "CAS AIDL Integration" am: 277701b5ec am: dee5b24c6f am: d745cdfe96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2412039

Change-Id: I41d351235d146ed10b0a6754ed9ac533ef357197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 20:44:12 +00:00
Venkatarama Avadhani
21222d705a CAS: Correct Status enum values
Bug: 266169861
Test: atest CtsMediaMiscTestCases

Change-Id: I4acda6a416cb72972e3fde0879d13254acb04fe0
2023-02-03 22:34:06 +00:00
Venkatarama Avadhani
9bd3427c7d CAS: Add openSession with no params
Add method to open a session with no arguments.

Bug: 266169861
Test: atest CtsMediaMiscTestCases

Change-Id: I912de02407716c9a5bcd28dabfa8eb8f45aef727
2023-02-03 22:33:36 +00:00
Treehugger Robot
e998394143 Merge "CAS: Fix memory leak in FactoryLoader" am: a81c9a1e2f am: c2ebcbb128 am: ce39fecafc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2412032

Change-Id: I3ec1aa0ee1b899e2193c904287e3bd37235435dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 08:03:53 +00:00
Shraddha Basantwani
09edb5748d CAS: Fix memory leak in FactoryLoader
Bug: 258638318
Bug: 262899644
Test: android.hardware.cas-service_fuzzer
Change-Id: Iff8a4e34a11f5a96e6c65cd84ee55f1712711670
2023-01-31 15:46:57 +05:30
Yixiao Luo
533c8bd208 Correct test config file location for VtsHalCasAidlTargetTest
Bug: 227673974
Test: VtsHalCasAidlTargetTest
Change-Id: Idabe8aa699fc3a9acbf20facb34c3aa48ac9e881
2023-01-23 18:38:21 -08:00
Yixiao Luo
104353d88d Add test config files for VtsHalCasAidlTargetTest
Bug: 227673974
Test: VtsHalCasAidlTargetTest
Change-Id: I5051b389575e21779a709e7ab20a6aedb6c41e59
2023-01-18 16:31:56 -08:00
Treehugger Robot
3d4c5a4464 Merge "CAS: Add missing @hide annotations" 2022-12-21 00:01:23 +00:00
Venkatarama Avadhani
af99386918 CAS: Add missing @hide annotations
Add the annotations that in the 3 enumeration classes so they are not
public.

Bug: 230377377, 227673974, 233862815
Test: build
Change-Id: Ia02b89069ee6fb85a2f16bcfe306d3482fe4bdb7
2022-12-19 22:02:09 +05:30
Venkatarama Avadhani
b4eb99bd97 CAS: Add @hide annotations
Add annotations so the java-source library can be used in
frameworks/base to initialize the constants.

Bug: 230377377, 227673974, 233862815
Test: build
Change-Id: Iff7f937bd996866e19a8b23492cb8a982d1d57fe
2022-12-06 16:40:53 +05:30
Venkatarama Avadhani
7b54065598 CAS: Update ScramblingMode enum order
Move the new enum to the end, so the values of the older enums do not
change.

Bug: 230377377, 227673974, 233862815
Test: None
Change-Id: I239e2b887af5b4d668d0f8eaacc77f18049c697a
2022-12-06 16:40:53 +05:30