Commit graph

313 commits

Author SHA1 Message Date
Xin Li
763c473c3d Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I976f80006aeb88bde2ae34ca4f9be72cea727d9e
Change-Id: Id94b25af52bd2e2847b6858697ab21cc6ce27aa3
2024-01-30 10:36:50 -08:00
V,Anilkumar
86f31e76b0 Don't mark SAT/DT as failures
If SAT/DT is not supported, should be marked as
ignored but they are marked as failures.
If no support for SAT/DT the implementation returns INVALID_ARGUMENTS
and test is calling the printSkipped function.
Instead of calling printSkipped, if GTEST_SKIP() called
unsupported TC results are parsed properly and test cases will move
to ignored category

Bug: 191229970
Test: VtsHalBroadcastradioV1_0TargetTest

Signed-off-by: V,Anilkumar <anilkumar.v@intel.com>
Change-Id: I4ed7828757a6cc8b83bae989e11289da1a3e814f
2024-01-12 19:31:12 +00:00
Weilin Xu
aba14a2412 Fix HD tune test in bcradio VTS
Bug: 315206962
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Icfdc9af0a18896d6b60900015c9e2063774dff7d
2023-12-13 13:11:22 -08:00
Weilin Xu
a7cc8a9acd Define customized program selector/info comparator
Define customized comparators for program selector and program info
in broadcast radio AIDL HAL utils library, which can be used to
sort program list by the order of frequency in HAL implementation of
devices other than emulator.

Bug: 315389663
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Ie8de342f3c123d896589751a6244f871ee07eb81
2023-12-11 12:45:11 -08:00
Weilin Xu
3bab613b4a Add HD radio tune VTS
Bug: 315206962
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I04f3f5c0e98d5c4a6d018805001809b3a23fa08a
2023-12-08 16:41:29 -08:00
Weilin Xu
90e39f542d Improve DAB radio support in refrence bcRadio HAL
Improved DAB radio support in the reference implementation for AIDL
broadcast radio HAL. Used real DAB service ID, ECC code, freuqnecy
and ensemble values for virtual DAB stations and implemented sub-channel
support for DAB radio.

Bug: 309693129
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I6a78794e16400f05c6d7c5ec99aa4978adca5b58
2023-11-29 21:26:50 -08:00
Weilin Xu
7991996514 Implement HD signal acquisition state in radio HAL
Implemented HD signal acquisition status change using program info flag
in the reference broadcast radio HAL.

Bug: 309694368
Test: seek/tune to an HD radio station in radio KS app
Change-Id: Ibde570429d4c21b2f894f8658de1b37001541f3a
2023-11-29 21:26:27 -08:00
Weilin Xu
4833896a0d Separate AM/FM band in default radio HAL
Separated AM/FM band so that seeking should loop within the band of
the current program info in default AIDL broadcast radio HAL
implementation. Also updated program list by tuner callback when the
AM/FM band is switched.

Bug: 309694368
Test: switch to AM and do not see FM stations in program list in radio KS app
Test: seek in FM band and do not jump any AM stations in radio KS app
Change-Id: Ia4618232d8726f2d779ac2ec87f169b0263ee979
2023-11-21 15:11:44 -08:00
Weilin Xu
39dd0f832b Add mock HD programs to default AIDL bcradio HAL
Added mocked HD radio programs and HD radio tune/seek/step support with
subchannel in the default AIDL broadcast radio HAL implementiation.

Bug: 309694368
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Id0ba9b127860d98822e9102ba48d913dc38cade1
2023-11-20 19:50:58 -08:00
Weilin Xu
ee546a6300 Fix missing return in default AIDL radio HAL Impl
Bug: 310027894
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Iea97042e553ddc2c3a20db189077ca4a41200c89
2023-11-15 13:14:58 -08:00
Weilin Xu
31c541c228 Upgrade default bcRadio AIDL HAL impl to version 2
Bug: 280300929
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I4bc9b24bf421bad8d980de2c82434abdf7cae74c
2023-10-30 16:02:24 -07:00
Weilin Xu
25409e5b6b Refactor utils and VTS for HD radio HAL support
Refactored AIDL broadcast radio HAL utils library to both support
version 2 HAL and guarantee backward compatibility for version 1 HAL
implementation using version 1 utils lib. Updated VTS to support HAL
of both AIDL versions.

Bug: 280300929
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I31e631c794f51c8df230b984837dfb4299864e5c
2023-10-30 16:02:13 -07:00
Weilin Xu
95f187b588 Improved HD radio support in broadcast radio HAL
Added identifier types, program info flags and metadata needed for
HD radio in AIDL broadcast radio HAL. Depracated SXM identifier
types since SXM is not supported.

Bug: 280300929
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I822b43e6452c308db1259b99b961378c14c8b294
2023-10-30 11:15:55 -07:00
Steven Moreland
50f1040abc broadcast radio fuzzer: remove vendor
This fuzzer was crashing immediately due to a
hermeticity issue where a vendor variant of libbinder
was used underneath libbinder_ndk (b/307611931).

Now, it is hanging in ~WorkerThread.

Fixes: 307611931
Test: run fuzzer
Change-Id: Iba16c6eefeb508e41951ba9f5b3e4fc7e2fc3457
2023-10-24 23:40:26 +00:00
Treehugger Robot
9de2576962 Merge "Merge OWNERS files for broadcastradio" into main am: a7b29b6338 am: 9cc1248e47 am: daf86b6795 am: d168e5471b am: 59a177ff78
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746937

Change-Id: If88502945bde89a1bca1060ea688e762bce4f482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 02:59:27 +00:00
Treehugger Robot
59a177ff78 Merge "Merge OWNERS files for broadcastradio" into main am: a7b29b6338 am: 9cc1248e47 am: daf86b6795 am: d168e5471b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746937

Change-Id: I06292a20c957d75246d0598ad55e47a1f76473ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 02:07:42 +00:00
Treehugger Robot
daf86b6795 Merge "Merge OWNERS files for broadcastradio" into main am: a7b29b6338 am: 9cc1248e47
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746937

Change-Id: I40af77ad4741359753e4fea289824e45c6bad95f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 00:37:15 +00:00
Treehugger Robot
9cc1248e47 Merge "Merge OWNERS files for broadcastradio" into main am: a7b29b6338
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746937

Change-Id: Ieed7e11e309fa3a8b4b0f622f5894bbfc104e40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 23:43:07 +00:00
Devin Moore
fde9e2de74 Merge OWNERS files for broadcastradio
Test: none
Bug: 296950573
Change-Id: I2f6e58593b4b699ffc8334c25c595055b5f6c496
2023-09-08 22:53:01 +00:00
Weilin Xu
37a6abe4c6 Clarify unsigned int type in AIDL program id
Clarified that the value in ProgramIdentifier in AIDL broadcast radio
HAL should be unsigned 64-bit int, but is represented as signed int
since unsigned int types are not supported in AIDL.

Bug: 299489486
Test: m -j
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:40a58baa2cf0380dcab908a6f1e3cf8fd11d351c)
Merged-In: I2f35cefebdf1b5e39bf48cab896b077c4cb6c2e4
Change-Id: I2f35cefebdf1b5e39bf48cab896b077c4cb6c2e4
2023-09-08 22:27:43 +00:00
Weilin Xu
29c567b256 Merge "Clarify unsigned int type in AIDL program id" into main 2023-09-08 22:26:15 +00:00
Weilin Xu
5d9b066c04 Fix bcradio HAL unsigned int comparison error
Bug: 299489486
Test: atest VtsHalBroadcastradioAidlTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:664048f21856ab30d5b713e524ef588f35747938)
Merged-In: I87fe60a593800535e0aadb0baf87696ee6844004
Change-Id: I87fe60a593800535e0aadb0baf87696ee6844004
2023-09-08 16:40:55 +00:00
Weilin Xu
40a58baa2c Clarify unsigned int type in AIDL program id
Clarified that the value in ProgramIdentifier in AIDL broadcast radio
HAL should be unsigned 64-bit int, but is represented as signed int
since unsigned int types are not supported in AIDL.

Bug: 299489486
Test: m -j
Change-Id: I2f35cefebdf1b5e39bf48cab896b077c4cb6c2e4
2023-09-08 09:27:25 -07:00
Weilin Xu
664048f218 Fix bcradio HAL unsigned int comparison error
Bug: 299489486
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I87fe60a593800535e0aadb0baf87696ee6844004
2023-09-07 13:21:55 -07:00
Weilin Xu
764fe0dea7 Implement default radio HAL stopProgramListUpdates
Implemented stopProgramListUpdates method in default AIDL broadcast
radio HAL. Created a separate thread for program list updates, so
that canceling pending tuning operations and canceling pending
program list updates are independent.

Bug: 243681584
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I9e09f267a2264fa0cbc280d0d6ea71037db519ac
2023-07-26 18:18:24 +00:00
Weilin Xu
bce78d1105 Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: 050c07c475
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: I52e0a5a66e613108fc60371cb382f3713b34f1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:32:03 +00:00
Weilin Xu
3bd4d9b299 Implement config flag in default AIDL radio HAL
Implemented getting and setting config flag method in IBroadcastRadio
inferface for default AIDL broadcast radio HAL.

Bug: 249850737
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Iedbae78fe3afccab5e8cbb850b2d8f3da3ab20d4
2023-07-20 18:33:17 +00:00
Weilin Xu
cf892db1ef Fix null pointer crash in AIDL radio HAL VTS
Bug: 277531858
Test: atest VtsHalBroadcastradioAidlTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:978de0a8a4968774e81e10e716a46bd9e1369479)
Merged-In: Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d
Change-Id: Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d
2023-07-19 19:46:04 +00:00
Weilin Xu
978de0a8a4 Fix null pointer crash in AIDL radio HAL VTS
Bug: 277531858
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d
2023-07-19 17:20:19 +00:00
Treehugger Robot
13b2b44565 Merge "Fix wrong timeout and mock method in radio VTS" into stage-aosp-udc-ts-dev am: d8f18469c3 am: a0dc5d033c am: e25159e0e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24068038

Change-Id: Icbf6430014b72004cfb3ed0035cf704e91344fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 22:12:41 +00:00
Weilin Xu
3729b0bd60 Fix wrong timeout and mock method in radio VTS
Fixed wrong time unit convension for timeout values used in broadcast
radio HAL VTS. Also replaced tuner callback mock method which caused
segmentation fault when unimplemented callback methods are called. In
addition, antenna connection state was checked at the end of the each
test instead of at the beginning.

Bug: 277531858
Test: atest VtsHalBroadcastradioAidlTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4420c1dbbf28cc80ac47cdbafb9cc81034f8fc8f)
Merged-In: Ied70fcfd2742ae5d253aec984e2161afa6f65162
Change-Id: Ied70fcfd2742ae5d253aec984e2161afa6f65162
2023-07-14 00:09:26 +00:00
Weilin Xu
4420c1dbbf Fix wrong timeout and mock method in radio VTS
Fixed wrong time unit convension for timeout values used in broadcast
radio HAL VTS. Also replaced tuner callback mock method which caused
segmentation fault when unimplemented callback methods are called. In
addition, antenna connection state was checked at the end of the each
test instead of at the beginning.

Bug: 277531858
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Ied70fcfd2742ae5d253aec984e2161afa6f65162
2023-07-11 22:34:19 +00:00
Weilin Xu
0576dbcee8 Fixed metadata label in AIDL radio HAL Metadata
Bug: 287517076
Test: atest VtsHalBroadcastradioAidlTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:285598dde00128cfc5fa5a9f7b7847d31daf3620)
Merged-In: I612ca079bda6f47446ec75ca7b4fece7317bd56d
Change-Id: I612ca079bda6f47446ec75ca7b4fece7317bd56d
2023-06-21 17:23:06 +00:00
Weilin Xu
285598dde0 Fixed metadata label in AIDL radio HAL Metadata
Bug: 287517076
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I612ca079bda6f47446ec75ca7b4fece7317bd56d
2023-06-20 23:58:37 +00:00
Weilin Xu
acb8fb6242 Add fuzzer for AIDL broadcast radio
Refactored Android.bp file and added fuzzer for default AIDL broadcast
radio HAL.

Bug: 246857025
Test: SANITIZE_TARGET=address make android.hardware.broadcastradio-service.default_fuzzer
cd ${ANDROID_PRODUCT_OUT}
adb root && adb sync data
adb shell /data/fuzz/x86_64/android.hardware.broadcastradio-service.default_fuzzer/vendor/android.hardware.broadcastradio-service.default_fuzzer --test_env=ENABLE_BLAZE_TEST_FUZZING=1 --test_arg=--minloglevel=0

Change-Id: I443fe6fccccb51626e6a58819f3f28ce11b0bff8
2023-05-17 17:20:52 +00:00
Weilin Xu
e2d763f25d Fix Result enum doc in AIDL broadcast radio HAL
Bug: 279789152
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I204f6c8836534e1bf6ff6309ca0172a2cbcc64a6
2023-04-26 21:49:32 +00: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
Weilin Xu
64cb963141 Allow secondary ids missing for DAB selector
Sometimes DAB program selector used in tuning does not have secondary
identifiers such as ensemble and frequency, and HAL will automatically
selector a DAB station with specified ensemble and frequency. Thus,
secondary ids in DAB program selector are not mandatory in HAL. Also
updated broadcast radio AIDL HAL documentation.

Bug: 273804622
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: If05b7eeb79e299667c3a64bf8b931bb6396f9045
2023-03-22 18:18:31 +00:00
Weilin Xu
f6c673b497 Enable toString for Result in broadcast radio HAL
ToString is enabled for Result enum in AIDL broadcast radio HAL. Some
automatic generated files were also modified when updating this AIDL
API.

Bug: 264931778
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Ia4ac02a95adbbcceac90c5b5106a7ea52dc447e9
2023-01-10 21:16:36 +00:00
Weilin Xu
0d4207d97a Improve DAB support in broadcast radio AIDL HAL
SID in DAB_SID_EXT was extended to 32-bit to support DMB radio.
The documatation for DAB program selector and program info was
updated to make a DAB station is uniquely specified. AIDL HAL
definition requirement for identifier, program selector and info
was enforced in the AIDL utils class. The default implementation
and VTS were also updated correspondingly.

Bug: 261912181
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Ic420955340f0c77370106e736410d7125536e62d
2022-12-22 01:29:36 +00:00
Weilin Xu
d7483327cb Add onTuneFailed when canceling tuning operation
Due to RadioTuner API documentation, onTuneFailed should be called
when a pending tuning operation is canceled. Therefore, a new
result value Canceled was added in broadcast radio HAL. The
onTuneFailed callback for pending tuning operations in default HAL
was implemented by adding whatIfCanceled function field in Task
struct in WorkerThread utils class.

Bug: 257337458
Test: atest RadioTunerTest#cancel_whenTune
Test: atest RadioTunerTest#cancel_whenSeek
Change-Id: I901ab2cc3561082e5f11a9f6c33db044fc9bc28b
2022-12-07 19:36:15 +00:00
Bob Badour
9fab4916b1 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  automotive/remoteaccess/impl/default/proto/Android.bp
  broadcastradio/aidl/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Idb39e78e5e4181fef165afd5451ac79597c89bfb
2022-09-29 11:59:23 -07:00
Weilin Xu
3277a210d8 Add VTS on config and parameter for AIDL radio HAL
Invalid and valid configuration and parameter inputs are tested
on broadcast radio AIDL HAL.

Test: atest VtsHalBroadcastradioAidlTargetTest
Bug: 249150763
Change-Id: If75d8318f493a8c5332064e5b09ecae102587266
2022-09-27 17:13:52 +00:00
Weilin Xu
b23d0ea0a9 Add VTS test for BroadcastRadio AIDL HAL
Tested methods defined in IBroadcastRadio. Methods such as tune,
seek, step and startProgramListUpdates are tested by the times of
that the mock of ITunerCallback, which is registered to
IBroadcastRadio, is called within timeout.

Bug: 249150763
Test: m -j, atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I84cb0da741dbcaf24a6562813846e81c23bbb1f1
2022-09-27 17:12:59 +00:00
Weilin Xu
97203b0f3e Add adb shell command to default AIDL
Add adb shell commands to call methods of tune, seek, step, cancel,
startProgramListUpdates and stopProgramListUpdates in
BroadcastRadio HAL.

Bug: 170336130
Test: m -j
Test: manually test dump options listed in "adb shell dumpsys
android.hardware.broadcastradio.IBroadcastRadio/amfm --help"

Change-Id: I7aac96459f61c36dc9aae2d0a3866272f5bb9aed
2022-09-26 22:53:45 +00:00
Weilin Xu
b2a6ca6828 Default implementation for BroadcastRadio AIDL HAL
Default implementation for BroadcastRadio AIDL HAL is based on
default implementation for HIDL 2.0, with necessary data type
conversion. The callback for IBroadcastRadio interface is
initialized as nullptr.

Bug: 170336130
Test: m -j
Change-Id: Id521573116c565c42af16333cad73c5dd0583420
2022-09-21 23:22:47 +00:00
Weilin Xu
a8cebd5c8f Migrate broadcast radio HAL from HIDL to AIDL
Radio HAL is migrated to AIDL by hidl2aidl tool, and the
following changes are applied:
- Result type is returned as service-specific error than normal
return value since AIDL only allows one return value of primitive
types.
- Integer data types were changed to int, long and byte.
- Constant enum was removed and replaced by constants defined in
IBroadcastRadio.
- Rds and Deemphasis enums were removed and defined as const in
AmFmRegionConfig
- MetadataKey was removed, and Metadata was defined as union.
- ITunerSession:scan() was renamed to ITunerSession:seek().
- ITunerSession was removed and its methods were added to
IBroadcastRadio.
- Callback for config flag setting was added to ITunerCallback.
- Callback and timeout behaviors are clarified.

Bug: 170336130
Test: m -j
Change-Id: Id1cdc5651037429ca07a4d4dc4682709cfc4949b
2022-09-21 23:09:50 +00:00
Weilin Xu
bd15745bf2 Added new owner to broadcast AIDL HAL
Bug: 170336130
Test: m -j
Change-Id: I63d6c0f1a32b7f75a17b0c1a4e1d9b47bdc9a17f
2022-08-26 23:54:26 +00:00
Weilin Xu
9f4ff57bc1 Fix invalid DAB station in default radio HAL
The SID and ensemble value of mock DAB station for default
emulator implementation is changed to valid value.

Bug: 240196218
Test: m -j
Change-Id: Ifd34b86a00c29c15c5ef6d21d6d405eb0b1ff072
2022-08-02 18:26:44 +00:00
Weilin Xu
6821a3028f Merge "Fix programList update bug in default radio HAL" 2022-07-07 16:18:14 +00:00