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

Commit 0070df83 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk: simplify AStatus get" am: 4635555a am: 690b999c am:... 

Merge "libbinder_ndk: simplify AStatus get" am: 4635555a am: 690b999c am: be99f267 am: 22e00139 am: c77abf1c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1434714

Change-Id: Id91d0651f5ec956a7918402a4daa5ef426a735fa
parents cbf8a329 c77abf1c

libs/binder/ndk/parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ binder_status_t AParcel_readParcelFileDescriptor(const AParcel* parcel, int* fd) 
}



binder_status_t AParcel_writeStatusHeader(AParcel* parcel, const AStatus* status) {

    return PruneStatusT(status->get()->writeToParcel(parcel->get()));

    return PruneStatusT(status->get().writeToParcel(parcel->get()));

}

binder_status_t AParcel_readStatusHeader(const AParcel* parcel, AStatus** status) {

    ::android::binder::Status bstatus;

libs/binder/ndk/status.cpp

+6 −6
Original line number Diff line number Diff line
@@ -47,27 +47,27 @@ AStatus* AStatus_fromStatus(binder_status_t status) { 
}



bool AStatus_isOk(const AStatus* status) {

    return status->get()->isOk();

    return status->get().isOk();

}



binder_exception_t AStatus_getExceptionCode(const AStatus* status) {

    return PruneException(status->get()->exceptionCode());

    return PruneException(status->get().exceptionCode());

}



int32_t AStatus_getServiceSpecificError(const AStatus* status) {

    return status->get()->serviceSpecificErrorCode();

    return status->get().serviceSpecificErrorCode();

}



binder_status_t AStatus_getStatus(const AStatus* status) {

    return PruneStatusT(status->get()->transactionError());

    return PruneStatusT(status->get().transactionError());

}



const char* AStatus_getMessage(const AStatus* status) {

    return status->get()->exceptionMessage().c_str();

    return status->get().exceptionMessage().c_str();

}



const char* AStatus_getDescription(const AStatus* status) {

    android::String8 description = status->get()->toString8();

    android::String8 description = status->get().toString8();

    char* cStr = new char[description.size() + 1];

    memcpy(cStr, description.c_str(), description.size() + 1);

    return cStr;

libs/binder/ndk/status_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ struct AStatus { 
    AStatus() {}  // ok

    explicit AStatus(::android::binder::Status&& status) : mStatus(std::move(status)) {}



    ::android::binder::Status* get() { return &mStatus; }

    const ::android::binder::Status* get() const { return &mStatus; }

    const ::android::binder::Status& get() const { return mStatus; }



   private:

    ::android::binder::Status mStatus;