commit dd772b4a3a7830670113bcfb8a263b6f549181b2
author Steven Moreland <smoreland@google.com> Fri Oct 12 15:15:06 2018 -0700
committer Steven Moreland <smoreland@google.com> Fri Oct 12 15:16:20 2018 -0700
tree 52da424eed3cafc622546c320258e84f3fd14b0f
parent 872da2d5d17d35bdb929fd7ad896b8b28eab1fda

Status: no 'okay' EX_TRANSACTION_FAILED

When EX_TRANSACTION_FAILED is set, mError will never be okay.

From libbinder's fb26e720a27e464e388986e665a43f6dfa815144.

Bug: 116618418
Test: boot
Change-Id: I09d95649976c0e8ef6cc5f4002c93b1b7cbba9a8

base/Status.cpp

diff --git a/base/Status.cpp b/base/Status.cpp
index 7161bc0..5a4c918 100644
--- a/base/Status.cpp
+++ b/base/Status.cpp
@@ -82,11 +82,17 @@
 }
 
 Status Status::fromExceptionCode(int32_t exceptionCode) {
+    if (exceptionCode == EX_TRANSACTION_FAILED) {
+        return Status(exceptionCode, FAILED_TRANSACTION);
+    }
     return Status(exceptionCode, OK);
 }
 
 Status Status::fromExceptionCode(int32_t exceptionCode,
                                  const char *message) {
+    if (exceptionCode == EX_TRANSACTION_FAILED) {
+        return Status(exceptionCode, FAILED_TRANSACTION, message);
+    }
     return Status(exceptionCode, OK, message);
 }
 
@@ -107,7 +113,7 @@
 
 void Status::setException(int32_t ex, const char *message) {
     mException = ex;
-    mErrorCode = NO_ERROR;  // an exception, not a transaction failure.
+    mErrorCode = ex == EX_TRANSACTION_FAILED ? FAILED_TRANSACTION : NO_ERROR;
     mMessage = message;
 }