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

Commit 06100b39 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Implement broadcast radio HAL 2.0 default implementation. 

Also, split internal common utils library to 1.x and 2.x.

Test: VTS
Bug: 69958777
Change-Id: I21244c74270a07cc350e8a2b974dafcdae02a0e8
parent 5bbf35ff

broadcastradio/1.1/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ cc_test { 
        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

        "android.hardware.broadcastradio@1.2",  // common-utils-lib dependency

        "android.hardware.broadcastradio@common-utils-lib",

        "android.hardware.broadcastradio@common-utils-1x-lib",

        "android.hardware.broadcastradio@vts-utils-lib",

        "libgmock",

    ],

broadcastradio/1.1/vts/functional/VtsHalBroadcastradioV1_1TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#define LOG_TAG "broadcastradio.vts"



#include <VtsHalHidlTargetTestBase.h>

#include <android-base/logging.h>

#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>

#include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h>

#include <android/hardware/broadcastradio/1.1/ITuner.h>

#include <android/hardware/broadcastradio/1.1/ITunerCallback.h>

#include <android/hardware/broadcastradio/1.1/types.h>

#include <android-base/logging.h>

#include <broadcastradio-utils/Utils.h>

#include <broadcastradio-utils-1x/Utils.h>

#include <broadcastradio-vts-utils/call-barrier.h>

#include <broadcastradio-vts-utils/mock-timeout.h>

#include <cutils/native_handle.h>

broadcastradio/1.2/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ cc_binary { 
        "service.cpp"

    ],

    static_libs: [

        "android.hardware.broadcastradio@common-utils-1x-lib",

        "android.hardware.broadcastradio@common-utils-lib",

    ],

    shared_libs: [

broadcastradio/1.2/default/Tuner.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "BroadcastRadio.h"

#include "Tuner.h"



#include <broadcastradio-utils/Utils.h>

#include <broadcastradio-utils-1x/Utils.h>

#include <log/log.h>



namespace android {

broadcastradio/1.2/default/VirtualProgram.cpp

+1 −8
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

#include "VirtualProgram.h"



#include <broadcastradio-utils/Utils.h>

#include <broadcastradio-utils-1x/Utils.h>



#include "resources.h"
@@ -83,13 +83,6 @@ bool operator<(const VirtualProgram& lhs, const VirtualProgram& rhs) { 
    if (l.primaryId.type != r.primaryId.type) return l.primaryId.type < r.primaryId.type;

    if (l.primaryId.value != r.primaryId.value) return l.primaryId.value < r.primaryId.value;



    // A little exception for HD Radio subchannel - we check secondary ID too.

    if (utils::hasId(l, IdentifierType::HD_SUBCHANNEL) &&

        utils::hasId(r, IdentifierType::HD_SUBCHANNEL)) {

        return utils::getId(l, IdentifierType::HD_SUBCHANNEL) <

               utils::getId(r, IdentifierType::HD_SUBCHANNEL);

    }



    return false;

}