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

Commit 1c864c07 authored by Amy Zhang's avatar Amy Zhang Committed by Automerger Merge Worker
Browse files

Merge "Avoid using fromServiceSpecificError on success paths" into sc-dev am: ac563b1a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14166416

Change-Id: I8bdad2b659d0401f406a84bf1779d3a97318ee7e
parents c7089e5d ac563b1a

services/tuner/TunerFilter.cpp

+5 −3
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ Status TunerFilter::getAvSharedHandleInfo(TunerFilterSharedHandleInfo* _aidl_ret 
        res = r;

        if (res == Result::SUCCESS) {

            TunerFilterSharedHandleInfo info{

                .handle = dupToAidl(hidl_handle(avMemory.getNativeHandle())),

                .handle = dupToAidl(avMemory),

                .size = static_cast<int64_t>(avMemSize),

            };

            *_aidl_return = move(info);
@@ -480,8 +480,11 @@ Status TunerFilter::getAvSharedHandleInfo(TunerFilterSharedHandleInfo* _aidl_ret 
        }

    });



    if (res != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(res));

    }

    return Status::ok();

}



Status TunerFilter::releaseAvHandle(

        const ::aidl::android::hardware::common::NativeHandle& handle, int64_t avDataId) {
@@ -497,7 +500,6 @@ Status TunerFilter::releaseAvHandle( 
    return Status::ok();

}





Status TunerFilter::start() {

    if (mFilter == nullptr) {

        ALOGE("IFilter is not initialized");

services/tuner/TunerLnb.cpp

+20 −5
Original line number Diff line number Diff line
@@ -48,8 +48,11 @@ Status TunerLnb::setCallback( 


    sp<ILnbCallback> lnbCallback = new LnbCallback(tunerLnbCallback);

    Result status = mLnb->setCallback(lnbCallback);

    if (status != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerLnb::setVoltage(int voltage) {

    if (mLnb == NULL) {
@@ -58,8 +61,11 @@ Status TunerLnb::setVoltage(int voltage) { 
    }



    Result status = mLnb->setVoltage(static_cast<LnbVoltage>(voltage));

    if (status != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerLnb::setTone(int tone) {

    if (mLnb == NULL) {
@@ -68,8 +74,11 @@ Status TunerLnb::setTone(int tone) { 
    }



    Result status = mLnb->setTone(static_cast<LnbTone>(tone));

    if (status != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerLnb::setSatellitePosition(int position) {

    if (mLnb == NULL) {
@@ -78,8 +87,11 @@ Status TunerLnb::setSatellitePosition(int position) { 
    }



    Result status = mLnb->setSatellitePosition(static_cast<LnbPosition>(position));

    if (status != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerLnb::sendDiseqcMessage(const vector<uint8_t>& diseqcMessage) {

    if (mLnb == NULL) {
@@ -88,8 +100,11 @@ Status TunerLnb::sendDiseqcMessage(const vector<uint8_t>& diseqcMessage) { 
    }



    Result status = mLnb->sendDiseqcMessage(diseqcMessage);

    if (status != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerLnb::close() {

    if (mLnb == NULL) {

services/tuner/TunerTimeFilter.cpp

+12 −4
Original line number Diff line number Diff line
@@ -38,8 +38,11 @@ Status TunerTimeFilter::setTimeStamp(int64_t timeStamp) { 
    }



    Result status = mTimeFilter->setTimeStamp(timeStamp);

    if (status != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerTimeFilter::clearTimeStamp() {

    if (mTimeFilter == NULL) {
@@ -48,8 +51,11 @@ Status TunerTimeFilter::clearTimeStamp() { 
    }



    Result status = mTimeFilter->clearTimeStamp();

    if (status != Result::SUCCESS) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerTimeFilter::getSourceTime(int64_t* _aidl_return) {

    if (mTimeFilter == NULL) {
@@ -66,9 +72,10 @@ Status TunerTimeFilter::getSourceTime(int64_t* _aidl_return) { 
            });

    if (status != Result::SUCCESS) {

        *_aidl_return = (int64_t)Constant64Bit::INVALID_PRESENTATION_TIME_STAMP;

    }

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerTimeFilter::getTimeStamp(int64_t* _aidl_return) {

    if (mTimeFilter == NULL) {
@@ -85,9 +92,10 @@ Status TunerTimeFilter::getTimeStamp(int64_t* _aidl_return) { 
            });

    if (status != Result::SUCCESS) {

        *_aidl_return = (int64_t)Constant64Bit::INVALID_PRESENTATION_TIME_STAMP;

    }

        return Status::fromServiceSpecificError(static_cast<int32_t>(status));

    }

    return Status::ok();

}



Status TunerTimeFilter::close() {

    if (mTimeFilter == NULL) {