commit aea9f83e6d95a15de668716c627093b17c6bc229
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 26 17:22:57 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 26 17:22:59 2017 +0000
tree 794a0573aa8a5a000a3453067e4a348916e99a0e
parent 13f7f62af6b04ae4683a1e7189dbb51a9fab3648
parent 1cd40b387a9e93531e2cab29e21c0d29f5d2702d

Merge "Remove unnecessary dependencies."

base/include/hidl/Status.h

diff --git a/base/include/hidl/Status.h b/base/include/hidl/Status.h
index 7c716c7..f812ebb 100644
--- a/base/include/hidl/Status.h
+++ b/base/include/hidl/Status.h
@@ -161,9 +161,17 @@
         }
 
         // Check if underlying error is DEAD_OBJECT.
-        // Does not set mCheckedStatus.
+        // Check mCheckedStatus only if this method returns true.
         bool isDeadObject() const {
-            return mStatus.transactionError() == DEAD_OBJECT;
+            bool dead = mStatus.transactionError() == DEAD_OBJECT;
+
+            // This way, if you only check isDeadObject your process will
+            // only be killed for more serious unchecked errors
+            if (dead) {
+                mCheckedStatus = true;
+            }
+
+            return dead;
         }
 
         // For debugging purposes only