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

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

Merge "Do not change callback when original callback is null."

parents 3f8832fd 1960a1ee

services/tuner/TunerFilter.cpp

+4 −2
Original line number Diff line number Diff line
@@ -453,9 +453,11 @@ void TunerFilter::FilterCallback::attachSharedFilterCallback( 


void TunerFilter::FilterCallback::detachSharedFilterCallback() {

    Mutex::Autolock _l(mCallbackLock);

    if (mTunerFilterCallback != nullptr && mOriginalCallback != nullptr) {

        mTunerFilterCallback = mOriginalCallback;

        mOriginalCallback = nullptr;

    }

}



}  // namespace tuner

}  // namespace tv

services/tuner/hidl/TunerHidlFilter.cpp

+4 −2
Original line number Diff line number Diff line
@@ -941,9 +941,11 @@ void TunerHidlFilter::FilterCallback::attachSharedFilterCallback( 


void TunerHidlFilter::FilterCallback::detachSharedFilterCallback() {

    Mutex::Autolock _l(mCallbackLock);

    if (mTunerFilterCallback != nullptr && mOriginalCallback != nullptr) {

        mTunerFilterCallback = mOriginalCallback;

        mOriginalCallback = nullptr;

    }

}



/////////////// FilterCallback Helper Methods ///////////////////////

void TunerHidlFilter::FilterCallback::getAidlFilterEvent(