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

Commit 1960a1ee authored by Hongguang's avatar Hongguang Committed by Hongguang Chen
Browse files

Do not change callback when original callback is null. 

Bug: 206042321
Test: atest android.media.tv.tuner.cts
Change-Id: I3df6c6d5cd8bcf5a7ad8299e917cde6851636397
parent 178f0b73

services/tuner/TunerFilter.cpp

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




void TunerFilter::FilterCallback::detachSharedFilterCallback() {

void TunerFilter::FilterCallback::detachSharedFilterCallback() {

    Mutex::Autolock _l(mCallbackLock);

    Mutex::Autolock _l(mCallbackLock);

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

        mTunerFilterCallback = mOriginalCallback;

        mTunerFilterCallback = mOriginalCallback;

        mOriginalCallback = nullptr;

        mOriginalCallback = nullptr;

    }

    }

}





}  // namespace tuner

}  // namespace tuner

}  // namespace tv

}  // namespace tv

services/tuner/hidl/TunerHidlFilter.cpp

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




void TunerHidlFilter::FilterCallback::detachSharedFilterCallback() {

void TunerHidlFilter::FilterCallback::detachSharedFilterCallback() {

    Mutex::Autolock _l(mCallbackLock);

    Mutex::Autolock _l(mCallbackLock);

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

        mTunerFilterCallback = mOriginalCallback;

        mTunerFilterCallback = mOriginalCallback;

        mOriginalCallback = nullptr;

        mOriginalCallback = nullptr;

    }

    }

}





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

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

void TunerHidlFilter::FilterCallback::getAidlFilterEvent(

void TunerHidlFilter::FilterCallback::getAidlFilterEvent(