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

Commit 47285b27 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update SharedFilter token acquire/free API name"

parents 159257a4 ad02185f

services/tuner/TunerFilter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ TunerFilter::~TunerFilter() { 
    return res;

}



::ndk::ScopedAStatus TunerFilter::createSharedFilter(string* _aidl_return) {

::ndk::ScopedAStatus TunerFilter::acquireSharedFilterToken(string* _aidl_return) {

    Mutex::Autolock _l(mLock);

    if (mFilter == nullptr) {

        ALOGE("IFilter is not initialized");
@@ -369,7 +369,7 @@ TunerFilter::~TunerFilter() { 
    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus TunerFilter::releaseSharedFilter(const string& /* in_filterToken */) {

::ndk::ScopedAStatus TunerFilter::freeSharedFilterToken(const string& /* in_filterToken */) {

    Mutex::Autolock _l(mLock);

    if (mFilter == nullptr) {

        ALOGE("IFilter is not initialized");

services/tuner/TunerFilter.h

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ public: 
    ::ndk::ScopedAStatus stop() override;

    ::ndk::ScopedAStatus flush() override;

    ::ndk::ScopedAStatus close() override;

    ::ndk::ScopedAStatus createSharedFilter(string* _aidl_return) override;

    ::ndk::ScopedAStatus releaseSharedFilter(const string& in_filterToken) override;

    ::ndk::ScopedAStatus acquireSharedFilterToken(string* _aidl_return) override;

    ::ndk::ScopedAStatus freeSharedFilterToken(const string& in_filterToken) override;

    ::ndk::ScopedAStatus getFilterType(DemuxFilterType* _aidl_return) override;



    bool isSharedFilterAllowed(int32_t pid);

services/tuner/aidl/android/media/tv/tuner/ITunerFilter.aidl

+5 −5
Original line number Diff line number Diff line
@@ -101,19 +101,19 @@ interface ITunerFilter { 
    void close();



    /**

     * Create a new SharedFilter instance.

     * Acquire a new SharedFilter token.

     *

     * @return a token of the newly created SharedFilter instance.

     */

    String createSharedFilter();

    String acquireSharedFilterToken();



    /**

     * Release a SharedFilter instance.

     * Free a SharedFilter token.

     *

     * @param filterToken the SharedFilter will be released.

     * @param filterToken the SharedFilter token will be released.

     * @return a token of the newly created SharedFilter instance.

     */

    void releaseSharedFilter(in String filterToken);

    void freeSharedFilterToken(in String filterToken);



    /**

     * Get filter type.

services/tuner/hidl/TunerHidlFilter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ TunerHidlFilter::~TunerHidlFilter() { 
    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus TunerHidlFilter::createSharedFilter(string* _aidl_return) {

::ndk::ScopedAStatus TunerHidlFilter::acquireSharedFilterToken(string* _aidl_return) {

    Mutex::Autolock _l(mLock);

    if (mFilter == nullptr) {

        ALOGE("IFilter is not initialized");
@@ -545,7 +545,7 @@ TunerHidlFilter::~TunerHidlFilter() { 
    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus TunerHidlFilter::releaseSharedFilter(const string& /* in_filterToken */) {

::ndk::ScopedAStatus TunerHidlFilter::freeSharedFilterToken(const string& /* in_filterToken */) {

    Mutex::Autolock _l(mLock);

    if (mFilter == nullptr) {

        ALOGE("IFilter is not initialized");

services/tuner/hidl/TunerHidlFilter.h

+2 −2
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ public: 
    ::ndk::ScopedAStatus stop() override;

    ::ndk::ScopedAStatus flush() override;

    ::ndk::ScopedAStatus close() override;

    ::ndk::ScopedAStatus createSharedFilter(string* _aidl_return) override;

    ::ndk::ScopedAStatus releaseSharedFilter(const string& in_filterToken) override;

    ::ndk::ScopedAStatus acquireSharedFilterToken(string* _aidl_return) override;

    ::ndk::ScopedAStatus freeSharedFilterToken(const string& in_filterToken) override;

    ::ndk::ScopedAStatus getFilterType(DemuxFilterType* _aidl_return) override;



    bool isSharedFilterAllowed(int32_t pid);