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

Commit e80bc97a authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

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

am: 8d9818db

* commit '8d9818db':
  libbinder: Use char* message with binder::Status

Change-Id: I4a2fcfbcd288d8810f2664d4c078895c4a9d5cfc
parents 4a912c41 8d9818db

include/binder/Status.h

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


    // A more readable alias for the default constructor.

    static Status ok();



    // Authors should explicitly pick whether their integer is:

    //  - an exception code (EX_* above)

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

    static Status fromExceptionCode(int32_t exceptionCode,

                                    const String8& message);

    static Status fromExceptionCode(int32_t exceptionCode,

                                    const char* message);



    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode);

    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode,

                                           const String8& message);

    static Status fromServiceSpecificError(int32_t serviceSpecificErrorCode,

                                           const char* message);



    static Status fromStatusT(status_t status);



    Status() = default;

libs/binder/Status.cpp

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ Status Status::fromExceptionCode(int32_t exceptionCode, 
    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) {

    return Status(EX_SERVICE_SPECIFIC, serviceSpecificErrorCode);

}
@@ -41,6 +46,11 @@ Status Status::fromServiceSpecificError(int32_t serviceSpecificErrorCode, 
    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 ret;

    ret.setFromStatusT(status);