Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31c541c2 authored by Weilin Xu's avatar Weilin Xu
Browse files

Upgrade default bcRadio AIDL HAL impl to version 2 

Bug: 280300929
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I4bc9b24bf421bad8d980de2c82434abdf7cae74c
parent 25409e5b

broadcastradio/aidl/default/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -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",

broadcastradio/aidl/default/BroadcastRadio.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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");

broadcastradio/aidl/default/broadcastradio-default.xml

+1 −1
Original line number Diff line number Diff line 
<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>