diff --git a/broadcastradio/2.0/Android.bp b/broadcastradio/2.0/Android.bp index 74090059a1..2434fdc859 100644 --- a/broadcastradio/2.0/Android.bp +++ b/broadcastradio/2.0/Android.bp @@ -8,7 +8,7 @@ hidl_interface { }, srcs: [ "types.hal", - "IAnnouncementObserver.hal", + "IAnnouncementListener.hal", "IBroadcastRadio.hal", "ICloseHandle.hal", "ITunerCallback.hal", diff --git a/broadcastradio/2.0/IAnnouncementObserver.hal b/broadcastradio/2.0/IAnnouncementListener.hal similarity index 86% rename from broadcastradio/2.0/IAnnouncementObserver.hal rename to broadcastradio/2.0/IAnnouncementListener.hal index c91e29a708..1b4960ce0d 100644 --- a/broadcastradio/2.0/IAnnouncementObserver.hal +++ b/broadcastradio/2.0/IAnnouncementListener.hal @@ -16,11 +16,11 @@ package android.hardware.broadcastradio@2.0; /** - * Callback interface for announcement observer. + * Callback interface for announcement listener. * - * For typical configuration, the observer is a broadcast radio service. + * For typical configuration, the listener is a broadcast radio service. */ -interface IAnnouncementObserver { +interface IAnnouncementListener { /** * Called whenever announcement list has changed. * diff --git a/broadcastradio/2.0/IBroadcastRadio.hal b/broadcastradio/2.0/IBroadcastRadio.hal index 7578f4453b..bedc362e06 100644 --- a/broadcastradio/2.0/IBroadcastRadio.hal +++ b/broadcastradio/2.0/IBroadcastRadio.hal @@ -15,7 +15,7 @@ package android.hardware.broadcastradio@2.0; -import IAnnouncementObserver; +import IAnnouncementListener; import ICloseHandle; import ITunerCallback; import ITunerSession; @@ -104,7 +104,7 @@ interface IBroadcastRadio { getImage(uint32_t id) generates (vec image); /** - * Registers announcement observer. + * Registers announcement listener. * * If there is at least one observer registered, HAL implementation must * notify about announcements even if no sessions are active. @@ -113,15 +113,15 @@ interface IBroadcastRadio { * automatically. * * @param enabled The list of announcement types to watch for. - * @param cb The callback interface. + * @param listener The listener interface. * @return result OK in case of success. * NOT_SUPPORTED if the tuner doesn't support announcements. * @return closeHandle A handle to unregister observer, * nullptr if result was not OK. */ - registerAnnouncementObserver( + registerAnnouncementListener( vec enabled, - IAnnouncementObserver cb + IAnnouncementListener listener ) generates ( Result result, ICloseHandle closeHandle diff --git a/broadcastradio/2.0/default/BroadcastRadio.cpp b/broadcastradio/2.0/default/BroadcastRadio.cpp index d16aaff7ff..aa5afad2f9 100644 --- a/broadcastradio/2.0/default/BroadcastRadio.cpp +++ b/broadcastradio/2.0/default/BroadcastRadio.cpp @@ -141,9 +141,9 @@ Return BroadcastRadio::getImage(uint32_t id, getImage_cb _hidl_cb) { return {}; } -Return BroadcastRadio::registerAnnouncementObserver( - const hidl_vec& enabled, const sp& /* cb */, - registerAnnouncementObserver_cb _hidl_cb) { +Return BroadcastRadio::registerAnnouncementListener( + const hidl_vec& enabled, const sp& /* listener */, + registerAnnouncementListener_cb _hidl_cb) { ALOGV("%s(%s)", __func__, toString(enabled).c_str()); _hidl_cb(Result::NOT_SUPPORTED, nullptr); diff --git a/broadcastradio/2.0/default/BroadcastRadio.h b/broadcastradio/2.0/default/BroadcastRadio.h index 7904946e22..8c14d9e662 100644 --- a/broadcastradio/2.0/default/BroadcastRadio.h +++ b/broadcastradio/2.0/default/BroadcastRadio.h @@ -36,9 +36,9 @@ struct BroadcastRadio : public IBroadcastRadio { Return getDabRegionConfig(getDabRegionConfig_cb _hidl_cb); Return openSession(const sp& callback, openSession_cb _hidl_cb) override; Return getImage(uint32_t id, getImage_cb _hidl_cb); - Return registerAnnouncementObserver(const hidl_vec& enabled, - const sp& cb, - registerAnnouncementObserver_cb _hidl_cb); + Return registerAnnouncementListener(const hidl_vec& enabled, + const sp& listener, + registerAnnouncementListener_cb _hidl_cb); std::reference_wrapper mVirtualRadio; Properties mProperties; diff --git a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp index 1111478714..8d9d622c81 100644 --- a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp +++ b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp @@ -90,7 +90,7 @@ class TunerCallbackMock : public ITunerCallback { utils::ProgramInfoSet mProgramList; }; -struct AnnouncementObserverMock : public IAnnouncementObserver { +struct AnnouncementListenerMock : public IAnnouncementListener { MOCK_METHOD1(onListUpdated, Return(const hidl_vec&)); }; @@ -702,15 +702,15 @@ TEST_F(BroadcastRadioHalTest, HdRadioStationNameId) { } /** - * Test announcement observer registration. + * Test announcement listener registration. * * Verifies that: - * - registerAnnouncementObserver either succeeds or returns NOT_SUPPORTED; + * - registerAnnouncementListener either succeeds or returns NOT_SUPPORTED; * - if it succeeds, it returns a valid close handle (which is a nullptr otherwise); * - closing handle does not crash. */ -TEST_F(BroadcastRadioHalTest, AnnouncementObserverRegistration) { - sp observer = new AnnouncementObserverMock(); +TEST_F(BroadcastRadioHalTest, AnnouncementListenerRegistration) { + sp listener = new AnnouncementListenerMock(); Result halResult = Result::UNKNOWN_ERROR; sp closeHandle = nullptr; @@ -720,7 +720,7 @@ TEST_F(BroadcastRadioHalTest, AnnouncementObserverRegistration) { }; auto hidlResult = - mModule->registerAnnouncementObserver({AnnouncementType::EMERGENCY}, observer, cb); + mModule->registerAnnouncementListener({AnnouncementType::EMERGENCY}, listener, cb); ASSERT_TRUE(hidlResult.isOk()); if (halResult == Result::NOT_SUPPORTED) {