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

Commit 2a91bd73 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove never-reached 'return' statements"

parents a366ec1a 358a2bbe

nfc/aidl/default/Nfc.cpp

+14 −17
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ void OnDeath(void* cookie) { 
        LOG(INFO) << "Nfc::open null callback";

        LOG(INFO) << "Nfc::open null callback";

        return ndk::ScopedAStatus::fromServiceSpecificError(

        return ndk::ScopedAStatus::fromServiceSpecificError(

                static_cast<int32_t>(NfcStatus::FAILED));

                static_cast<int32_t>(NfcStatus::FAILED));

    } else {

    }

    Nfc::mCallback = clientCallback;

    Nfc::mCallback = clientCallback;





    clientDeathRecipient = AIBinder_DeathRecipient_new(OnDeath);

    clientDeathRecipient = AIBinder_DeathRecipient_new(OnDeath);
@@ -57,9 +57,6 @@ void OnDeath(void* cookie) { 
    return ret == 0 ? ndk::ScopedAStatus::ok()

    return ret == 0 ? ndk::ScopedAStatus::ok()

                    : ndk::ScopedAStatus::fromServiceSpecificError(

                    : ndk::ScopedAStatus::fromServiceSpecificError(

                              static_cast<int32_t>(NfcStatus::FAILED));

                              static_cast<int32_t>(NfcStatus::FAILED));

        return ndk::ScopedAStatus::ok();

    }

    return ndk::ScopedAStatus::ok();

}

}





::ndk::ScopedAStatus Nfc::close(NfcCloseType type) {

::ndk::ScopedAStatus Nfc::close(NfcCloseType type) {