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

Commit 8d9818db authored by Christopher Wiley's avatar Christopher Wiley Committed by Gerrit Code Review
Browse files

Merge "libbinder: Use char* message with binder::Status"

parents caff47a0 1651ced6

include/binder/Status.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,7 @@ public: 




    // A more readable alias for the default constructor.

    // A more readable alias for the default constructor.

    static Status ok();

    static Status ok();



    // Authors should explicitly pick whether their integer is:

    // Authors should explicitly pick whether their integer is:

    //  - an exception code (EX_* above)

    //  - an exception code (EX_* above)

    //  - service specific error code

    //  - service specific error code
@@ -84,9 +85,15 @@ public: 
    static Status fromExceptionCode(int32_t exceptionCode);

    static Status fromExceptionCode(int32_t exceptionCode);

    static Status fromExceptionCode(int32_t exceptionCode,

    static Status fromExceptionCode(int32_t exceptionCode,

                                    const String8& message);

                                    const String8& message);

    static Status fromExceptionCode(int32_t exceptionCode,

                                    const char* message);



    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode);

    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode);

    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode,

    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode,

                                           const String8& message);

                                           const String8& message);

    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode,

                                           const char* message);



    static Status fromStatusT(status_t status);

    static Status fromStatusT(status_t status);





    Status() = default;

    Status() = default;

libs/binder/Status.cpp

+10 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,11 @@ Status Status::fromExceptionCode(int32_t exceptionCode, 
    return Status(exceptionCode, OK, message);

    return Status(exceptionCode, OK, message);

}

}





Status Status::fromExceptionCode(int32_t exceptionCode,

                                 const char* message) {

    return fromExceptionCode(exceptionCode, String8(message));

}



Status Status::fromServiceSpecificError(int32_t serviceSpecificErrorCode) {

Status Status::fromServiceSpecificError(int32_t serviceSpecificErrorCode) {

    return Status(EX_SERVICE_SPECIFIC, serviceSpecificErrorCode);

    return Status(EX_SERVICE_SPECIFIC, serviceSpecificErrorCode);

}

}
@@ -41,6 +46,11 @@ Status Status::fromServiceSpecificError(int32_t serviceSpecificErrorCode, 
    return Status(EX_SERVICE_SPECIFIC, serviceSpecificErrorCode, message);

    return Status(EX_SERVICE_SPECIFIC, serviceSpecificErrorCode, message);

}

}





Status Status::fromServiceSpecificError(int32_t serviceSpecificErrorCode,

                                        const char* message) {

    return fromServiceSpecificError(serviceSpecificErrorCode, String8(message));

}



Status Status::fromStatusT(status_t status) {

Status Status::fromStatusT(status_t status) {

    Status ret;

    Status ret;

    ret.setFromStatusT(status);

    ret.setFromStatusT(status);