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

Commit 0d5ef5de authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Rename AnnouncementObserver to AnnouncementListener. 

I feel this wording match java naming more closely.

Bug: 68045105
Test: VTS
Change-Id: If30fa9b356b6b45fe8853bc5194c7098d0fb2aa5
parent 6118ea4d

broadcastradio/2.0/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ hidl_interface { 
    },

    srcs: [

        "types.hal",

        "IAnnouncementObserver.hal",

        "IAnnouncementListener.hal",

        "IBroadcastRadio.hal",

        "ICloseHandle.hal",

        "ITunerCallback.hal",

broadcastradio/2.0/IAnnouncementObserver.hal→broadcastradio/2.0/IAnnouncementListener.hal

+3 −3
Original line number Diff line number Diff line
@@ -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.

     *

broadcastradio/2.0/IBroadcastRadio.hal

+5 −5
Original line number Diff line number Diff line
@@ -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<uint8_t> 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<AnnouncementType> enabled,

            IAnnouncementObserver cb

            IAnnouncementListener listener

        ) generates (

            Result result,

            ICloseHandle closeHandle

broadcastradio/2.0/default/BroadcastRadio.cpp

+3 −3
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ Return<void> BroadcastRadio::getImage(uint32_t id, getImage_cb _hidl_cb) { 
    return {};

}



Return<void> BroadcastRadio::registerAnnouncementObserver(

    const hidl_vec<AnnouncementType>& enabled, const sp<IAnnouncementObserver>& /* cb */,

    registerAnnouncementObserver_cb _hidl_cb) {

Return<void> BroadcastRadio::registerAnnouncementListener(

    const hidl_vec<AnnouncementType>& enabled, const sp<IAnnouncementListener>& /* listener */,

    registerAnnouncementListener_cb _hidl_cb) {

    ALOGV("%s(%s)", __func__, toString(enabled).c_str());



    _hidl_cb(Result::NOT_SUPPORTED, nullptr);

broadcastradio/2.0/default/BroadcastRadio.h

+3 −3
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ struct BroadcastRadio : public IBroadcastRadio { 
    Return<void> getDabRegionConfig(getDabRegionConfig_cb _hidl_cb);

    Return<void> openSession(const sp<ITunerCallback>& callback, openSession_cb _hidl_cb) override;

    Return<void> getImage(uint32_t id, getImage_cb _hidl_cb);

    Return<void> registerAnnouncementObserver(const hidl_vec<AnnouncementType>& enabled,

                                              const sp<IAnnouncementObserver>& cb,

                                              registerAnnouncementObserver_cb _hidl_cb);

    Return<void> registerAnnouncementListener(const hidl_vec<AnnouncementType>& enabled,

                                              const sp<IAnnouncementListener>& listener,

                                              registerAnnouncementListener_cb _hidl_cb);



    std::reference_wrapper<const VirtualRadio> mVirtualRadio;

    Properties mProperties;