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

Commit bb5f29c9 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Use broadcastradio 1.1 default implementation by default.

Also, remove a warning for 1.1 interface, as the hidl freeze mechanism
is now in place.

Bug: b/34348946
Test: VTS, instrumentalization
Change-Id: I82025a7de8abd0758ba8b196bbbfc48b9322ac3b
parent 17cee14d
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -84,8 +84,4 @@ else
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
endif

ifeq ($(TARGET_USES_BCRADIO_FUTURE_FEATURES),true)
LOCAL_CFLAGS += -DTARGET_USES_BCRADIO_FUTURE_FEATURES
endif

include $(BUILD_EXECUTABLE)
+2 −14
Original line number Diff line number Diff line
@@ -32,13 +32,7 @@ using android::hardware::audio::effect::V2_0::IEffectsFactory;
using android::hardware::audio::V2_0::IDevicesFactory;
using android::hardware::soundtrigger::V2_0::ISoundTriggerHw;
using android::hardware::registerPassthroughServiceImplementation;
namespace broadcastradio = android::hardware::broadcastradio;

#ifdef TARGET_USES_BCRADIO_FUTURE_FEATURES
static const bool useBroadcastRadioFutureFeatures = true;
#else
static const bool useBroadcastRadioFutureFeatures = false;
#endif
using android::hardware::broadcastradio::V1_1::IBroadcastRadioFactory;

using android::OK;

@@ -52,13 +46,7 @@ int main(int /* argc */, char* /* argv */ []) {
    // Soundtrigger and FM radio might be not present.
    status = registerPassthroughServiceImplementation<ISoundTriggerHw>();
    ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status);
    if (useBroadcastRadioFutureFeatures) {
        status = registerPassthroughServiceImplementation<
            broadcastradio::V1_1::IBroadcastRadioFactory>();
    } else {
        status = registerPassthroughServiceImplementation<
            broadcastradio::V1_0::IBroadcastRadioFactory>();
    }
    status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>();
    ALOGE_IF(status != OK, "Error while registering fm radio service: %d", status);
    joinRpcThreadpool();
    return status;

broadcastradio/1.1/WARNING

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
This is experimental interface, do not use it yet.