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

Commit 6b968df4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove never-reached 'return' statements" am: 2a91bd73 am: 9dfd7f15... 

Merge "Remove never-reached 'return' statements" am: 2a91bd73 am: 9dfd7f15 am: 4dae3547 am: bc2d8a12

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1959367

Change-Id: I043a1e25872d3ff9857dc5315f48652fffc847ae
parents 2bcd5f61 bc2d8a12

nfc/aidl/default/Nfc.cpp

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

        return ndk::ScopedAStatus::fromServiceSpecificError(

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

    } else {

    }

    Nfc::mCallback = clientCallback;



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

                    : ndk::ScopedAStatus::fromServiceSpecificError(

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

        return ndk::ScopedAStatus::ok();

    }

    return ndk::ScopedAStatus::ok();

}



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