From 02b9cbaa85b08fba5dffba54a003258ec3b445a3 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Tue, 13 Jun 2017 09:34:30 -0700 Subject: [PATCH] Implement getProperties_1_1 for broadcast radio 1.1 default implementation. Bug: b/36863239 Bug: b/38167547 Test: instrumentation Change-Id: I129ff7c1a1e6a4711b6352dd6f22d16a324066f3 --- broadcastradio/1.1/default/BroadcastRadio.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/broadcastradio/1.1/default/BroadcastRadio.cpp b/broadcastradio/1.1/default/BroadcastRadio.cpp index 68c9b93870..d65fe6d63b 100644 --- a/broadcastradio/1.1/default/BroadcastRadio.cpp +++ b/broadcastradio/1.1/default/BroadcastRadio.cpp @@ -115,9 +115,17 @@ exit: return Void(); } -Return BroadcastRadio::getProperties_1_1(getProperties_1_1_cb _hidl_cb __unused) -{ - return Status::fromExceptionCode(Status::EX_UNSUPPORTED_OPERATION); +Return BroadcastRadio::getProperties_1_1(getProperties_1_1_cb _hidl_cb) { + radio_hal_properties_t halProperties; + V1_1::Properties properties = {}; + + LOG_ALWAYS_FATAL_IF(mHwDevice == nullptr, "HW device is not set"); + int rc = mHwDevice->get_properties(mHwDevice, &halProperties); + LOG_ALWAYS_FATAL_IF(rc != 0, "Couldn't get device properties"); + Utils::convertPropertiesFromHal(&properties.base, &halProperties); + + _hidl_cb(properties); + return Void(); } Return BroadcastRadio::openTuner(const BandConfig& config, bool audio,