Merge "Status: toString8, include stringified status_t" am: 3ee8935c6f

am: 3943411c5d

Change-Id: Iae258b1d8eabde305c95e3487fbccad7afe1252b

1 files changed, 3 insertions, 2 deletions

diff --git a/libs/binder/Status.cpp b/libs/binder/Status.cpp
index 0ad99cee3f..674f0657a9 100644
--- a/libs/binder/Status.cpp
+++ b/libs/binder/Status.cpp
@@ -232,9 +232,10 @@ String8 Status::toString8() const {
         ret.append("No error");
     } else {
         ret.appendFormat("Status(%d, %s): '", mException, exceptionToString(mException).c_str());
-        if (mException == EX_SERVICE_SPECIFIC ||
-            mException == EX_TRANSACTION_FAILED) {
+        if (mException == EX_SERVICE_SPECIFIC) {
             ret.appendFormat("%d: ", mErrorCode);
+        } else if (mException == EX_TRANSACTION_FAILED) {
+            ret.appendFormat("%s: ", statusToString(mErrorCode).c_str());
         }
         ret.append(String8(mMessage));
         ret.append("'");