Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 05:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade default bcRadio AIDL HAL impl to version 2

Browse Source 
Bug: 280300929
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I4bc9b24bf421bad8d980de2c82434abdf7cae74c
This commit is contained in:
Weilin Xu
2023-09-07 17:00:57 -07:00
parent 25409e5b6b
commit 31c541c228
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
broadcastradio/aidl/default/Android.bp
View File

@@ -26,11 +26,11 @@ package {
cc_defaults {
name: "BroadcastRadioHalDefaults",
static_libs: [
"android.hardware.broadcastradio@common-utils-aidl-lib",
"android.hardware.broadcastradio@common-utils-aidl-lib-V2",
"android.hardware.broadcastradio@common-utils-lib",
],
shared_libs: [
"android.hardware.broadcastradio-V1-ndk",
"android.hardware.broadcastradio-V2-ndk",
"libbase",
"libbinder_ndk",
"liblog",
@@ -84,7 +84,7 @@ cc_fuzz {
],
static_libs: [
"DefaultBroadcastRadioHal",
"android.hardware.broadcastradio-V1-ndk",
"android.hardware.broadcastradio-V2-ndk",
],
srcs: [
"fuzzer.cpp",

3
broadcastradio/aidl/default/BroadcastRadio.cpp
View File

@@ -16,6 +16,7 @@
#include "BroadcastRadio.h"
#include <broadcastradio-utils-aidl/Utils.h>
#include <broadcastradio-utils-aidl/UtilsV2.h>
#include "resources.h"
#include <aidl/android/hardware/broadcastradio/IdentifierType.h>
@@ -221,7 +222,7 @@ ScopedAStatus BroadcastRadio::tune(const ProgramSelector& program) {
resultToInt(Result::NOT_SUPPORTED), "selector is not supported");
}
if (!utils::isValid(program)) {
if (!utils::isValidV2(program)) {
LOG(ERROR) << __func__ << ": selector is not valid: " << program.toString();
return ScopedAStatus::fromServiceSpecificErrorWithMessage(
resultToInt(Result::INVALID_ARGUMENTS), "selector is not valid");

2
broadcastradio/aidl/default/broadcastradio-default.xml
View File

@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.broadcastradio</name>
<version>1</version>
<version>2</version>
<fqname>IBroadcastRadio/amfm</fqname>
<fqname>IBroadcastRadio/dab</fqname>
</hal>