Revert "ART: Workaround for b/20019689"
This reverts commit 328dd4457632f59e67d08d9d086670b56141a4b1.
Bug: 20019689
Change-Id: Ia1087e45d1a1817b6ff4e45f8d74b84d34f078ee
diff --git a/runtime/transaction.cc b/runtime/transaction.cc
index 5b8d23b..9b205c3 100644
--- a/runtime/transaction.cc
+++ b/runtime/transaction.cc
@@ -76,11 +76,7 @@
<< " while transaction is not aborted";
}
std::string abort_msg(GetAbortMessage());
- // Temporary workaround for b/20019689.
- if (self->IsExceptionPending()) {
- self->ClearException();
- }
- self->ThrowNewException(Transaction::kAbortExceptionSignature, abort_msg.c_str());
+ self->ThrowNewWrappedException(Transaction::kAbortExceptionSignature, abort_msg.c_str());
}
bool Transaction::IsAborted() {