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

Commit e76f5a3d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4502278 from 6658796b to pi-release 

Change-Id: Icf7081c61146662231ce0bbedf6526b61d60032b
parents 2d96931d 6658796b

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

+4 −25
Original line number Diff line number Diff line
@@ -17,15 +17,16 @@ 
#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 <broadcastradio-vts-utils/pointer-utils.h>

#include <cutils/native_handle.h>

#include <cutils/properties.h>

#include <gmock/gmock.h>
@@ -56,8 +57,7 @@ using V1_0::MetaData; 
using V1_0::MetadataKey;

using V1_0::MetadataType;



using std::chrono::steady_clock;

using std::this_thread::sleep_for;

using broadcastradio::vts::clearAndWait;



static constexpr auto kConfigTimeout = 10s;

static constexpr auto kConnectModuleTimeout = 1s;
@@ -115,27 +115,6 @@ class BroadcastRadioHalTest : public ::testing::VtsHalHidlTargetTestBase, 
    hidl_vec<BandConfig> mBands;

};



/**

 * Clears strong pointer and waits until the object gets destroyed.

 *

 * @param ptr The pointer to get cleared.

 * @param timeout Time to wait for other references.

 */

template <typename T>

static void clearAndWait(sp<T>& ptr, std::chrono::milliseconds timeout) {

    wp<T> wptr = ptr;

    ptr.clear();

    auto limit = steady_clock::now() + timeout;

    while (wptr.promote() != nullptr) {

        constexpr auto step = 10ms;

        if (steady_clock::now() + step > limit) {

            FAIL() << "Pointer was not released within timeout";

            break;

        }

        sleep_for(step);

    }

}



void BroadcastRadioHalTest::SetUp() {

    radioClass = GetParam();

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;

}